Fix new code and tests.

Author: serhiy-storchaka

Lib/test/test_urlparse.py

@@ -581,7 +581,7 @@ def test_urljoins(self):
         self.checkJoin('a', 'b', 'b')
 
         # Test with empty (but defined) components.
-        self.checkJoin(RFC1808_BASE, '', 'http://a/b/c/d;p?q#f')
+        self.checkJoin(RFC1808_BASE, '', 'http://a/b/c/d;p?q')
         self.checkJoin(RFC1808_BASE, '#', 'http://a/b/c/d;p?q#', relroundtrip=False)
         self.checkJoin(RFC1808_BASE, '#z', 'http://a/b/c/d;p?q#z')
         self.checkJoin(RFC1808_BASE, '?', 'http://a/b/c/d;p?', relroundtrip=False)
@@ -592,7 +592,7 @@ def test_urljoins(self):
         self.checkJoin(RFC1808_BASE, ';#z', 'http://a/b/c/;#z')
         self.checkJoin(RFC1808_BASE, ';x', 'http://a/b/c/;x')
         self.checkJoin(RFC1808_BASE, '/w', 'http://a/w')
-        self.checkJoin(RFC1808_BASE, '//', 'http://a/b/c/d;p?q#f')
+        self.checkJoin(RFC1808_BASE, '//', 'http://a/b/c/d;p?q')
         self.checkJoin(RFC1808_BASE, '//#z', 'http://a/b/c/d;p?q#z')
         self.checkJoin(RFC1808_BASE, '//?y', 'http://a/b/c/d;p?y')
         self.checkJoin(RFC1808_BASE, '//;x', 'http://;x')
@@ -601,7 +601,7 @@ def test_urljoins(self):
         # For backward compatibility with RFC1630, the scheme name is allowed
         # to be present in a relative reference if it is the same as the base
         # URI scheme.
-        self.checkJoin(RFC1808_BASE, 'http:', 'http://a/b/c/d;p?q#f')
+        self.checkJoin(RFC1808_BASE, 'http:', 'http://a/b/c/d;p?q')
         self.checkJoin(RFC1808_BASE, 'http:#', 'http://a/b/c/d;p?q#', relroundtrip=False)
         self.checkJoin(RFC1808_BASE, 'http:#z', 'http://a/b/c/d;p?q#z')
         self.checkJoin(RFC1808_BASE, 'http:?', 'http://a/b/c/d;p?', relroundtrip=False)
@@ -612,7 +612,7 @@ def test_urljoins(self):
         self.checkJoin(RFC1808_BASE, 'http:;#z', 'http://a/b/c/;#z')
         self.checkJoin(RFC1808_BASE, 'http:;x', 'http://a/b/c/;x')
         self.checkJoin(RFC1808_BASE, 'http:/w', 'http://a/w')
-        self.checkJoin(RFC1808_BASE, 'http://', 'http://a/b/c/d;p?q#f')
+        self.checkJoin(RFC1808_BASE, 'http://', 'http://a/b/c/d;p?q')
         self.checkJoin(RFC1808_BASE, 'http://#z', 'http://a/b/c/d;p?q#z')
         self.checkJoin(RFC1808_BASE, 'http://?y', 'http://a/b/c/d;p?y')
         self.checkJoin(RFC1808_BASE, 'http://;x', 'http://;x')

Lib/urllib/parse.py

@@ -587,8 +587,6 @@ def urljoin(base, url, allow_fragments=True):
         path = bpath
         if query is None:
             query = bquery
-            if fragment is None:
-                fragment = bfragment
         return _coerce_result(_urlunsplit(scheme, netloc, path,
                                           query, fragment))
 

Misc/NEWS.d/next/Library/2020-02-29-20-44-36.bpo-39799.qTHOaP.rst

@@ -1,2 +1 @@
-Fix ``urllib.parse.urljoin``.
-In RFC 3986, ``base``'s fragment is always discarded.
+The fragment of the base URI is now always discarded in :func:`urllib.parse.urljoin` in accordance to :rfc:`3986`.