-import time
+import time, calendar, collections.abc, binascii, base64
statusinfo = {
400: ("Bad Request", "Invalid HTTP request."),
403: ("Forbidden", "You are not authorized to request the requested resource."),
404: ("Not Found", "The requested resource was not found."),
405: ("Method Not Allowed", "The request method is not recognized or permitted by the requested resource."),
+ 429: ("Too Many Requests", "Your client is sending more frequent requests than are accepted."),
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."),
return None
tz = int(tz[1:])
tz = (((tz / 100) * 60) + (tz % 100)) * 60
- return time.mktime(time.strptime(dstr, "%a, %d %b %Y %H:%M:%S")) - tz - time.altzone
+ return calendar.timegm(time.strptime(dstr, "%a, %d %b %Y %H:%M:%S")) - tz
def pmimehead(hstr):
def pws(p):
</body>
</html>
""" % (title, title, htmlq(msg))
+ buf = buf.encode("us-ascii")
startreq("%i %s" % (code, title), [("Content-Type", "text/html"), ("Content-Length", str(len(buf)))])
return [buf]
def urlq(url):
+ if isinstance(url, str):
+ url = url.encode("utf-8")
ret = ""
- invalid = "&=#?/\"'"
+ invalid = b"%;&=+#?/\"'"
for c in url:
- if c in invalid or (ord(c) <= 32):
- ret += "%%%02X" % ord(c)
+ if c in invalid or (c <= 32) or (c >= 128):
+ ret += "%%%02X" % c
else:
- ret += c
+ ret += chr(c)
return ret
class urlerror(ValueError):
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 = ""
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
+
+# Wrap these, since binascii is a bit funky. :P
+def enhex(bs):
+ return base64.b16encode(bs).decode("us-ascii")
+def unhex(es):
+ if not isinstance(es, collections.abc.ByteString):
+ try:
+ es = es.encode("us-ascii")
+ except UnicodeError:
+ raise binascii.Error("non-ascii character in hex-string")
+ return base64.b16decode(es)
+def enb32(bs):
+ return base64.b32encode(bs).decode("us-ascii")
+def unb32(es):
+ if not isinstance(es, collections.abc.ByteString):
+ try:
+ es = es.encode("us-ascii")
+ except UnicodeError:
+ raise binascii.Error("non-ascii character in base32-string")
+ if (len(es) % 8) != 0:
+ es += b"=" * (8 - (len(es) % 8))
+ es = es.upper() # The whole point of Base32 is that it's case-insensitive :P
+ return base64.b32decode(es)
+def enb64(bs):
+ return base64.b64encode(bs).decode("us-ascii")
+def unb64(es):
+ if not isinstance(es, collections.abc.ByteString):
+ try:
+ es = es.encode("us-ascii")
+ except UnicodeError:
+ raise binascii.Error("non-ascii character in base64-string")
+ if (len(es) % 4) != 0:
+ es += b"=" * (4 - (len(es) % 4))
+ return base64.b64decode(es)
+
+def _quoprisafe():
+ ret = [False] * 256
+ for c in "-!*+/":
+ ret[ord(c)] = True
+ for c in range(ord('0'), ord('9') + 1):
+ ret[c] = True
+ for c in range(ord('A'), ord('Z') + 1):
+ ret[c] = True
+ for c in range(ord('a'), ord('z') + 1):
+ ret[c] = True
+ return ret
+_quoprisafe = _quoprisafe()
+def quopri(s, charset="utf-8"):
+ bv = s.encode(charset)
+ qn = sum(not _quoprisafe[b] for b in bv)
+ if qn == 0:
+ return s
+ if qn > len(bv) / 2:
+ return "=?%s?B?%s?=" % (charset, enb64(bv))
+ else:
+ return "=?%s?Q?%s?=" % (charset, "".join(chr(b) if _quoprisafe[b] else "=%02X" % b for b in bv))
+
+class mimeparam(object):
+ def __init__(self, name, val, fallback=None, charset="utf-8", lang=""):
+ self.name = name
+ self.val = val
+ self.fallback = fallback
+ self.charset = charset
+ self.lang = lang
+
+ def __str__(self):
+ self.name.encode("ascii")
+ try:
+ self.val.encode("ascii")
+ except UnicodeError:
+ pass
+ else:
+ return "%s=%s" % (self.name, self.val)
+ val = self.val.encode(self.charset)
+ self.charset.encode("ascii")
+ self.lang.encode("ascii")
+ ret = ""
+ if self.fallback is not None:
+ self.fallback.encode("ascii")
+ ret += "%s=%s; " % (self.name, self.fallback)
+ ret += "%s*=%s'%s'%s" % (self.name, self.charset, self.lang, urlq(val))
+ return ret
+
+class mimeheader(object):
+ def __init__(self, name, val, *, mime_charset="utf-8", mime_lang="", **params):
+ self.name = name
+ self.val = val
+ self.params = {}
+ self.charset = mime_charset
+ self.lang = mime_lang
+ for k, v in params.items():
+ self[k] = v
+
+ def __getitem__(self, nm):
+ return self.params[nm.lower()]
+
+ def __setitem__(self, nm, val):
+ if not isinstance(val, mimeparam):
+ val = mimeparam(nm, val, charset=self.charset, lang=self.lang)
+ self.params[nm.lower()] = val
+
+ def __delitem__(self, nm):
+ del self.params[nm.lower()]
+
+ def value(self):
+ parts = []
+ if self.val != None:
+ parts.append(quopri(self.val))
+ parts.extend(str(x) for x in self.params.values())
+ return("; ".join(parts))
+
+ def __str__(self):
+ if self.name is None:
+ return self.value()
+ return "%s: %s" % (self.name, self.value())
Dolda2000 GitWeb / wrw.git / blobdiff