-import cgi
+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 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":
+ try:
+ rbody = req.input.read(2 ** 20)
+ except IOError as exc:
+ return exc
+ if len(rbody) >= 2 ** 20:
+ return ValueError("x-www-form-urlencoded data is absurdly long")
+ buf.update(urlparse.parse_qsl(rbody))
+ return buf
class badmultipart(Exception):
pass
return ret
def close(self):
- self.fillbuf(-1)
+ while True:
+ if self.read(8192) == "":
+ break
def __enter__(self):
return self
self.lastpart.parsehead()
return self.lastpart
-def formdata(req):
- return req.item(formwrap)
+def formdata(req, onerror=Exception):
+ data = req.item(formparse)
+ if isinstance(data, Exception):
+ if onerror is Exception:
+ raise data
+ return onerror
+ return data