Merge branch 'master' into python3

Conflicts:
	wrw/dispatch.py

diff --combined wrw/dispatch.py
index 10cc2f6,4d22b72..768d3f4
--- 1/wrw/dispatch.py
--- 2/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@@ -1,5 -1,5 +1,5 @@@
  import sys, traceback
 -import env, req, proto
 +from . import env, req, proto
  
  __all__ = ["restart"]
  
@@@ -16,34 -16,8 +16,8 @@@ def mangle(result)
          return result
      return [str(result)]
  
- class iterproxy(object):
-     # Makes sure iter(real).next() is called immediately, in order to
-     # let generator code run.
-     def __init__(self, real):
-         self.bk = real
-         self.bki = iter(real)
-         self._next = [None]
-         self.__next__()
- 
-     def __iter__(self):
-         return self
- 
-     def __next__(self):
-         if self._next is None:
-             raise StopIteration()
-         ret = self._next[0]
-         try:
-             self._next[:] = [self.bki.__next__()]
-         except StopIteration:
-             self._next = None
-         return ret
- 
-     def close(self):
-         if hasattr(self.bk, "close"):
-             self.bk.close()
- 
  def defaulterror(req, excinfo):
 -    import resp
 +    from . import resp
      traceback.print_exception(*excinfo)
      raise resp.httperror(500)
  
@@@ -60,11 -34,11 +34,11 @@@ def handle(req, startreq, handler)
          resp = [""]
          while True:
              try:
-                 resp = iterproxy(handler(req))
+                 resp = handler(req)
                  break
 -            except restart, i:
 +            except restart as i:
                  handler = i.handle
 -            except Exception, i:
 +            except Exception as i:
                  if eh is None:
                      raise
                  handler = wraphandler(eh, sys.exc_info())

diff --combined wrw/util.py
index 5347ce4,55b4ee2..bf78f8e
--- 1/wrw/util.py
--- 2/wrw/util.py
+++ b/wrw/util.py
@@@ -1,20 -1,11 +1,20 @@@
  import inspect
 -import req, dispatch, session, form
 +from . import req, dispatch, session, form
  
  def wsgiwrap(callable):
      def wrapper(env, startreq):
          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)
@@@ -43,6 -34,37 +43,37 @@@ def persession(data = None)
          return wrapper
      return dec
  
 -        self.next()
+ class preiter(object):
+     __slots__ = ["bk", "bki", "_next"]
+     end = object()
+     def __init__(self, real):
+         self.bk = real
+         self.bki = iter(real)
+         self._next = None
 -    def next(self):
++        self.__next__()
+ 
+     def __iter__(self):
+         return self
+ 
++    def __next__(self):
+         if self._next is self.end:
+             raise StopIteration()
+         ret = self._next
+         try:
+             self._next = next(self.bki)
+         except StopIteration:
+             self._next = self.end
+         return ret
+ 
+     def close(self):
+         if hasattr(self.bk, "close"):
+             self.bk.close()
+ 
+ def pregen(callable):
+     def wrapper(*args, **kwargs):
+         return preiter(callable(*args, **kwargs))
+     return wrapper
+ 
  class sessiondata(object):
      @classmethod
      def get(cls, req, create = True):
@@@ -64,7 -86,7 +95,7 @@@
  class autodirty(sessiondata):
      @classmethod
      def get(cls, req):
 -        ret = super(autodirty, cls).get(req)
 +        ret = super().get(req)
          if "_is_dirty" not in ret.__dict__:
              ret.__dict__["_is_dirty"] = False
          return ret
@@@ -76,18 -98,18 +107,18 @@@
          return self._is_dirty
  
      def __setattr__(self, name, value):
 -        super(autodirty, self).__setattr__(name, value)
 +        super().__setattr__(name, value)
          if "_is_dirty" in self.__dict__:
              self.__dict__["_is_dirty"] = True
  
      def __delattr__(self, name):
 -        super(autodirty, self).__delattr__(name, value)
 +        super().__delattr__(name, value)
          if "_is_dirty" in self.__dict__:
              self.__dict__["_is_dirty"] = True
  
  class manudirty(object):
      def __init__(self, *args, **kwargs):
 -        super(manudirty, self).__init__(*args, **kwargs)
 +        super().__init__(*args, **kwargs)
          self.__dirty = False
  
      def sessfrozen(self):
@@@ -130,7 -152,7 +161,7 @@@ class specslot(object)
  
  class specclass(type):
      def __init__(self, name, bases, tdict):
 -        super(specclass, self).__init__(name, bases, tdict)
 +        super().__init__(name, bases, tdict)
          sslots = set()
          dslots = set()
          for cls in self.__mro__:
@@@ -142,7 -164,8 +173,7 @@@
          for i, slot in enumerate(self.__sslots_a__):
              setattr(self, slot, specslot(slot, i, slot in dslots))
  
 -class specdirty(sessiondata):
 -    __metaclass__ = specclass
 +class specdirty(sessiondata, metaclass=specclass):
      __slots__ = ["session", "__sslots__", "_is_dirty"]
      
      def __specinit__(self):
@@@ -150,7 -173,7 +181,7 @@@
  
      @staticmethod
      def __new__(cls, req, sess):
 -        self = super(specdirty, cls).__new__(cls)
 +        self = super().__new__(cls)
          self.session = sess
          self.__sslots__ = [specslot.unbound] * len(cls.__sslots_a__)
          self.__specinit__()