X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fproto.py;h=aed5c4edb301992e5280da2ec1b68563e4f06ecb;hb=08a4b741946ae4d55d864f7c527657ab46b8d83b;hp=d2762d5194f71f602ef60bd2bd6e6f2541f58589;hpb=eed3cf12fd2fc59252cbed23aff8f1930a658773;p=wrw.git diff --git a/wrw/proto.py b/wrw/proto.py index d2762d5..aed5c4e 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): @@ -63,7 +67,7 @@ def pmimehead(hstr): break p += 1 v, p = token(p, ';') - pars[k] = v + pars[k.lower()] = v return val, pars def htmlq(html): @@ -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