X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fproto.py;h=3d8b96e6f22e1afb91992dafd3a3ba03a0faf6d8;hb=e21c438203ce0654499264e31bd673ee924e6254;hp=7df66ff1d91d00b97eabb4c7962e4fc60aaea679;hpb=ea18777a1f761acd6b790467db79679b94850af9;p=wrw.git

diff --git a/wrw/proto.py b/wrw/proto.py
index 7df66ff..3d8b96e 100644
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -1,8 +1,12 @@
 statusinfo = {
-    400: ("Bad Request", "Your issued HTTP request is invalid."),
-    403: ("Forbidden", "You are not authorized to view the requested resource."),
+    400: ("Bad Request", "Invalid HTTP request."),
+    401: ("Unauthorized", "Authentication must be provided for the requested resource."),
+    403: ("Forbidden", "You are not authorized to request the requested resource."),
     404: ("Not Found", "The requested resource was not found."),
-    500: ("Server Error", "An internal error occurred.")
+    405: ("Method Not Allowed", "The request method is not recognized or permitted by the requested resource."),
+    500: ("Server Error", "An internal error occurred."),
+    501: ("Not Implemented", "The requested functionality has not been implemented."),
+    503: ("Service Unavailable", "Service is being denied at this time."),
     }
 
 def httpdate(ts):
@@ -109,7 +113,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)
@@ -138,7 +142,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:
@@ -152,3 +156,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