Merge branch 'master' into python2

[wrw.git] / wrw / proto.py

diff --git a/wrw/proto.py b/wrw/proto.py
index 36a9db9..7cb6d31 100644 (file)
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -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