X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fproto.py;h=7cb6d311e8f612207141c1a3e3b3f7f1f59ad9a4;hb=bdc80241ffb5b50b1c9fb6500778e97b3f7170e6;hp=a67fa19d1a89921f8778dc6501f0500cfad5d27d;hpb=b6f62b898efdc272130d3dbdd6742c5b785e7c7d;p=wrw.git

diff --git a/wrw/proto.py b/wrw/proto.py
index a67fa19..7cb6d31 100644
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -105,7 +105,7 @@ def urlq(url):
     if isinstance(url, unicode):
         url = url.encode("utf-8")
     ret = ""
-    invalid = ";&=#?/\"'"
+    invalid = "%;&=#?/\"'"
     for c in url:
         if c in invalid or (ord(c) <= 32) or (ord(c) >= 128):
             ret += "%%%02X" % ord(c)
@@ -191,7 +191,7 @@ def parstring(pars={}, **augment):
 def parurl(url, pars={}, **augment):
     qs = parstring(pars, **augment)
     if qs != "":
-        return url + "?" + qs
+        return url + ("&" if "?" in url else "?") + qs
     else:
         return url