Merge branch 'master' into python3

Conflicts:
	wrw/dispatch.py

diff --cc wrw/dispatch.py
index e51559e1fbe4b477a847af6bc1ea985a588393f2,fa1f669d8f43099f6c41c3f919689496409cf725..10cc2f6ef8014d451e330ebdf9119eee00bf3627
--- 1/wrw/dispatch.py
--- 2/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@@ -1,5 -1,5 +1,5 @@@
  import sys, traceback
- from . import env
 -import env, req, proto
++from . import env, req, proto
  
  __all__ = ["restart"]
  

diff --cc wrw/util.py
index a7f1e4c24a4ede42cc206f51aa269f79248b6323,6368b18f198eb65fe3cc024fcd4747a40b3aa78e..5347ce4a3e85a5078d562e9578f1be49b1cb0b9a
--- 1/wrw/util.py
--- 2/wrw/util.py
+++ b/wrw/util.py
@@@ -3,18 -3,9 +3,18 @@@ from . import req, dispatch, session, f
  
  def wsgiwrap(callable):
      def wrapper(env, startreq):
-         return dispatch.handle(req.origrequest(env), startreq, callable)
+         return dispatch.handleenv(env, startreq, callable)
      return wrapper
  
 +def stringwrap(charset):
 +    def dec(callable):
 +        def wrapper(*args, **kwargs):
 +            bk = callable(*args, **kwargs)
 +            for string in bk:
 +                yield string.encode(charset)
 +        return wrapper
 +    return dec
 +
  def formparams(callable):
      def wrapper(req):
          data = form.formdata(req)