Merge branch 'master' into python3

Conflicts:
	wrw/util.py

diff --cc wrw/dispatch.py
Simple merge

diff --cc wrw/resp.py
Simple merge

diff --cc wrw/util.py
index eb27683,4306e9b..f70de0d
--- 1/wrw/util.py
--- 2/wrw/util.py
+++ b/wrw/util.py
@@@ -1,20 -1,12 +1,21 @@@
- import inspect
- from . import req, dispatch, session, form, resp
+ import inspect, math
 -import req, dispatch, session, form, resp, proto
++from . import req, dispatch, session, form, resp, proto
  
  def wsgiwrap(callable):
      def wrapper(env, startreq):
          return dispatch.handleenv(env, startreq, callable)
+     wrapper.__wrapped__ = 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)