X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fproto.py;h=70f8f77b8a68bfe20b471cbec687ac6ee1d9ddb0;hp=ad1775aabf7952f2e4e7e044a80c6d0bf1b8f51a;hb=0bf1ac2ff3015d0072a336e670bd952d0e73535e;hpb=e1e1218fd66230e4ac8c7fca36a4c9a7b2496cf5

diff --git a/wrw/proto.py b/wrw/proto.py
index ad1775a..70f8f77 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
@@ -168,11 +168,16 @@ def scripturl(req):
         raise Exception("Malformed local part when reconstructing URL")
     return siteurl(req) + req.uriname[1:]
 
-def requrl(req):
+def requrl(req, qs=True):
     s = siteurl(req)
     if req.uri[0] != '/':
         raise Exception("Malformed local part when reconstructing URL")
-    return siteurl(req) + req.uri[1:]
+    pf = req.uri[1:]
+    if not qs:
+        p = pf.find('?')
+        if not p < 0:
+            pf = pf[:p]
+    return siteurl(req) + pf
 
 def parstring(pars={}, **augment):
     buf = ""
@@ -182,17 +187,21 @@ def parstring(pars={}, **augment):
             del augment[key]
         else:
             val = pars[key]
+        if val is None:
+            continue
         if buf != "": buf += "&"
         buf += urlq(key) + "=" + urlq(str(val))
-    for key in augment:
+    for key, val in augment.items():
+        if val is None:
+            continue
         if buf != "": buf += "&"
-        buf += urlq(key) + "=" + urlq(str(augment[key]))
+        buf += urlq(key) + "=" + urlq(str(val))
     return buf
 
 def parurl(url, pars={}, **augment):
     qs = parstring(pars, **augment)
     if qs != "":
-        return url + "?" + qs
+        return url + ("&" if "?" in url else "?") + qs
     else:
         return url