From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 5 Aug 2012 16:18:22 +0000 (+0200)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/wrw
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=7be9e8bb560cd4e969992759bbcb523b40e544af;hp=c6e56d74040e480cda56a66f5e52d2ceafce5ca7

Merge branch 'master' of git.dolda2000.com:/srv/git/r/wrw
---

diff --git a/wrw/proto.py b/wrw/proto.py
index ab3737b..b1f0ab3 100644
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -115,7 +115,7 @@ def parseurl(url):
         local = local[:q]
     return proto, host, local, query
 
-def consurl(proto, host, local, query = ""):
+def consurl(proto, host, local, query=""):
     if len(local) < 1 and local[0] != '/':
         raise urlerror("Local part of URL must begin with a slash")
     ret = "%s://%s%s" % (proto, host, local)
@@ -144,7 +144,7 @@ def requrl(req):
         raise Exception("Malformed local part when reconstructing URL")
     return "%s://%s%s" % (proto, host, req.uri)
 
-def parstring(pars = {}, **augment):
+def parstring(pars={}, **augment):
     buf = ""
     for key in pars:
         if key in augment:
@@ -158,3 +158,10 @@ def parstring(pars = {}, **augment):
         if buf != "": buf += "&"
         buf += urlq(key) + "=" + urlq(str(augment[key]))
     return buf
+
+def parurl(url, pars={}, **augment):
+    qs = parstring(pars, **augment)
+    if qs != "":
+        return url + "?" + qs
+    else:
+        return url