X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fproto.py;h=628bfc9fb5d22adaaa7914ffe254247ae47d32c2;hp=ad1775aabf7952f2e4e7e044a80c6d0bf1b8f51a;hb=d6d4c944902dd58bfd5cbb3a0187d309637f4df1;hpb=dff9b8aa90e1f93807ab301675de3be1bf1f0ad8

diff --git a/wrw/proto.py b/wrw/proto.py
index ad1775a..628bfc9 100644
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -106,7 +106,7 @@ def urlq(url):
     if isinstance(url, str):
         url = url.encode("utf-8")
     ret = ""
-    invalid = b";&=#?/\"'"
+    invalid = b"%;&=#?/\"'"
     for c in url:
         if c in invalid or (c <= 32) or (c >= 128):
             ret += "%%%02X" % c
@@ -192,7 +192,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