Simplify and speed-up quote_plus().

diff --git a/Lib/urllib.py b/Lib/urllib.py
index b8ba4540226c2517142ad1ac52ae6cbf7d1092fc..2889b3dbfb0d9fe9703f9bd7cc29219d436b45c5 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1115,12 +1115,9 @@ def quote(s, safe = '/'):
 def quote_plus(s, safe = ''):
     """Quote the query fragment of a URL; replacing ' ' with '+'"""
     if ' ' in s:
-        l = s.split(' ')
-        for i in range(len(l)):
-            l[i] = quote(l[i], safe)
-        return '+'.join(l)
-    else:
-        return quote(s, safe)
+        s = s.replace(' ', '+')
+        safe += '+'
+    return quote(s, safe)
 
 def urlencode(query,doseq=0):
     """Encode a sequence of two-element tuples or dictionary into a URL query string.