1 files changed, 2 insertions, 7 deletions
diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 4ac9867331..a019a7b7a4 100644
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -256,14 +256,9 @@ def urljoin(base, url, allow_fragments=True):
     if path[:1] == '/':
         return urlunparse((scheme, netloc, path,
                            params, query, fragment))
-    if not path:
+    if not path and not params:
         path = bpath
-        if not params:
-            params = bparams
-        else:
-            path = path[:-1]
-            return urlunparse((scheme, netloc, path,
-                                params, query, fragment))
+        params = bparams
         if not query:
             query = bquery
         return urlunparse((scheme, netloc, path,