From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 7 May 2014 16:13:40 +0000 (+0200)
Subject: Merge branch 'master' into python2
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=0d4c1b8b8da9e20c4bc9fb41ff1136283821b98e;hp=69a029dcfdd72f66a31aadcd4517bb13d5803127

Merge branch 'master' into python2
---

diff --git a/wrw/form.py b/wrw/form.py
index de40092..da13a4a 100644
--- a/wrw/form.py
+++ b/wrw/form.py
@@ -7,7 +7,7 @@ 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(2 ** 20)
+        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))