X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fform.py;h=da13a4ae7301cf08b9237387b63b1a59f9cbb7db;hp=98d2ed9c5c7725eedf42e5f21ad03ff527f306fb;hb=0d4c1b8b8da9e20c4bc9fb41ff1136283821b98e;hpb=a02127330452ddc72406bb1e2e3eeadefe773ebb

diff --git a/wrw/form.py b/wrw/form.py
index 98d2ed9..da13a4a 100644
--- a/wrw/form.py
+++ b/wrw/form.py
@@ -1,41 +1,17 @@
-import cgi
-from . import proto
+import urlparse
+import proto
 
 __all__ = ["formdata"]
 
-class formwrap(object):
-    def __init__(self, req):
-        if req.ihead.get("Content-Type") == "application/x-www-form-urlencoded":
-            self.cf = cgi.parse(environ = req.env, fp = req.input)
-        else:
-            self.cf = cgi.parse(environ = req.env)
-
-    def __getitem__(self, key):
-        return self.cf[key][0]
-
-    def get(self, key, default = ""):
-        if key in self:
-            return self.cf[key][0]
-        return default
-
-    def __contains__(self, key):
-        return key in self.cf and len(self.cf[key]) > 0
-
-    def __iter__(self):
-        return iter(self.cf)
-
-    def items(self):
-        def iter():
-            for key, list in self.cf.items():
-                for val in list:
-                    yield key, val
-        return list(iter())
-
-    def keys(self):
-        return list(self.cf.keys())
-
-    def values(self):
-        return [val for key, val in self.items()]
+def formparse(req):
+    buf = {}
+    buf.update(urlparse.parse_qsl(req.query))
+    if req.ihead.get("Content-Type") == "application/x-www-form-urlencoded":
+        rbody = req.input.read(2 ** 20)
+        if len(rbody) >= 2 ** 20:
+            raise ValueError("x-www-form-urlencoded data is absurdly long")
+        buf.update(urlparse.parse_qsl(rbody))
+    return buf
 
 class badmultipart(Exception):
     pass
@@ -43,7 +19,7 @@ class badmultipart(Exception):
 class formpart(object):
     def __init__(self, form):
         self.form = form
-        self.buf = b""
+        self.buf = ""
         self.eof = False
         self.head = {}
 
@@ -52,8 +28,8 @@ class formpart(object):
 
     def fillbuf(self, sz):
         req = self.form.req
-        mboundary = b"\r\n--" + self.form.boundary + b"\r\n"
-        lboundary = b"\r\n--" + self.form.boundary + b"--\r\n"
+        mboundary = "\r\n--" + self.form.boundary + "\r\n"
+        lboundary = "\r\n--" + self.form.boundary + "--\r\n"
         while not self.eof:
             p = self.form.buf.find(mboundary)
             if p >= 0:
@@ -78,7 +54,7 @@ class formpart(object):
                     raise badmultipart("Missing last multipart boundary")
                 self.form.buf += ret
 
-    def read(self, limit = -1):
+    def read(self, limit=-1):
         self.fillbuf(limit)
         if limit >= 0:
             ret = self.buf[:limit]
@@ -88,10 +64,10 @@ class formpart(object):
             self.buf = ""
         return ret
 
-    def readline(self, limit = -1):
+    def readline(self, limit=-1):
         last = 0
         while True:
-            p = self.buf.find(b'\n', last)
+            p = self.buf.find('\n', last)
             if p < 0:
                 if self.eof:
                     ret = self.buf
@@ -114,15 +90,12 @@ class formpart(object):
         self.close()
         return False
 
-    def parsehead(self, charset):
+    def parsehead(self):
         def headline():
             ln = self.readline(256)
-            if ln[-1] != ord(b'\n'):
+            if ln[-1] != '\n':
                 raise badmultipart("Too long header line in part")
-            try:
-                return ln.decode(charset).rstrip()
-            except UnicodeError:
-                raise badmultipart("Form part header is not in assumed charset")
+            return ln.rstrip()
 
         ln = headline()
         while True:
@@ -154,34 +127,30 @@ class formpart(object):
             raise badmultipart("Form part uses unexpected transfer encoding: %r" % encoding)
 
 class multipart(object):
-    def __init__(self, req, charset):
+    def __init__(self, req):
         val, par = proto.pmimehead(req.ihead.get("Content-Type", ""))
         if req.method != "POST" or val != "multipart/form-data":
             raise badmultipart("Request is not a multipart form")
         if "boundary" not in par:
             raise badmultipart("Multipart form lacks boundary")
-        try:
-            self.boundary = par["boundary"].encode("us-ascii")
-        except UnicodeError:
-            raise badmultipart("Multipart boundary must be ASCII string")
+        self.boundary = par["boundary"]
         self.req = req
-        self.buf = b"\r\n"
+        self.buf = "\r\n"
         self.eof = False
-        self.headcs = charset
         self.lastpart = formpart(self)
         self.lastpart.close()
 
     def __iter__(self):
         return self
 
-    def __next__(self):
+    def next(self):
         if not self.lastpart.eof:
             raise RuntimeError("All form parts must be read entirely")
         if self.eof:
             raise StopIteration()
         self.lastpart = formpart(self)
-        self.lastpart.parsehead(self.headcs)
+        self.lastpart.parsehead()
         return self.lastpart
 
 def formdata(req):
-    return req.item(formwrap)
+    return req.item(formparse)