From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 30 Aug 2012 14:14:19 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=825ac8f0cafe69dfb61c127556ef50f0f92e6168;hp=f54a3465e5aaf03fe394d2702be6889cb06f37c6;p=wrw.git

Merge branch 'master' into python3
---

diff --git a/wrw/form.py b/wrw/form.py
index dbd0e02..98d2ed9 100644
--- a/wrw/form.py
+++ b/wrw/form.py
@@ -6,7 +6,7 @@ __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.env["wsgi.input"])
+            self.cf = cgi.parse(environ = req.env, fp = req.input)
         else:
             self.cf = cgi.parse(environ = req.env)
 
@@ -73,7 +73,7 @@ class formpart(object):
             if sz >= 0 and len(self.buf) >= sz:
                 break
             while len(self.form.buf) <= len(lboundary):
-                ret = req.env["wsgi.input"].read(8192)
+                ret = req.input.read(8192)
                 if ret == "":
                     raise badmultipart("Missing last multipart boundary")
                 self.form.buf += ret