Merge branch 'master' into jython

Conflicts:
	wrw/req.py

diff --git a/wrw/req.py b/wrw/req.py
index 5fbc2fe..fbe732b 100644 (file)
--- a/wrw/req.py
+++ b/wrw/req.py
@@ -1,4 +1,4 @@
-import io
+import StringIO
 
 __all__ = ["request"]
 
@@ -56,7 +56,7 @@ class limitreader(object):
         self.bk = back
         self.limit = limit
         self.rb = 0
-        self.buf = bytearray()
+        self.buf = ""
 
     def close(self):
         pass
@@ -69,9 +69,9 @@ class limitreader(object):
             ret = self.bk.read(ra - len(self.buf))
             if ret == "":
                 raise IOError("Unexpected EOF")
-            self.buf.extend(ret)
+            self.buf += ret
             self.rb += len(ret)
-        ret = str(self.buf[:ra])
+        ret = self.buf[:ra]
         self.buf = self.buf[ra:]
         return ret
 
@@ -80,17 +80,17 @@ class limitreader(object):
         while True:
             p = self.buf.find('\n', off)
             if p >= 0:
-                ret = str(self.buf[:p + 1])
+                ret = self.buf[:p + 1]
                 self.buf = self.buf[p + 1:]
                 return ret
             off = len(self.buf)
             if size >= 0 and len(self.buf) >= size:
-                ret = str(self.buf[:size])
+                ret = self.buf[:size]
                 self.buf = self.buf[size:]
                 return ret
             if self.rb == self.limit:
-                ret = str(self.buf)
-                self.buf = bytearray()
+                ret = self.buf
+                self.buf = ""
                 return ret
             ra = self.limit - self.rb
             if size >= 0:
@@ -99,7 +99,7 @@ class limitreader(object):
             ret = self.bk.read(ra)
             if ret == "":
                 raise IOError("Unpexpected EOF")
-            self.buf.extend(ret)
+            self.buf += ret
             self.rb += len(ret)
 
     def readlines(self, hint=None):
@@ -148,7 +148,7 @@ class origrequest(request):
                     self.input = limitreader(env["wsgi.input"], int(clen))
                 else:
                     # XXX: What to do?
-                    self.input = io.BytesIO("")
+                    self.input = StringIO.StringIO("")
             else:
                 # Assume input is chunked and read until ordinary EOF.
                 self.input = env["wsgi.input"]

diff --git a/wrw/session.py b/wrw/session.py
index 43b9087..24d89d7 100644 (file)
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import threading, time, pickle, random, os
 import cookie, env
 

diff --git a/wrw/util.py b/wrw/util.py
index 5ee002b..2e3a795 100644 (file)
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import inspect
 import req, dispatch, session, form
 
@@ -12,9 +13,9 @@ def formparams(callable):
         spec = inspect.getargspec(callable)
         args = dict(data.items())
         args["req"] = req
-        if not spec.keywords:
+        if not spec[2]:
             for arg in list(args):
-                if arg not in spec.args:
+                if arg not in spec[0]:
                     del args[arg]
         return callable(**args)
     return wrapper

diff --git a/wrw/wmako.py b/wrw/wmako.py
index 491d8b3..86bc201 100644 (file)
--- a/wrw/wmako.py
+++ b/wrw/wmako.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import os, threading
 from mako import template, lookup, filters
 import util, form, session, env