Merge branch 'master' into python3

Conflicts:
	wrw/dispatch.py

diff --combined wrw/dispatch.py
index e51559e,fa1f669..10cc2f6
--- 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"]
  
@@@ -23,17 -23,17 +23,17 @@@ class iterproxy(object)
          self.bk = real
          self.bki = iter(real)
          self._next = [None]
 -        self.next()
 +        self.__next__()
  
      def __iter__(self):
          return self
  
 -    def next(self):
 +    def __next__(self):
          if self._next is None:
              raise StopIteration()
          ret = self._next[0]
          try:
 -            self._next[:] = [self.bki.next()]
 +            self._next[:] = [self.bki.__next__()]
          except StopIteration:
              self._next = None
          return ret
@@@ -43,7 -43,7 +43,7 @@@
              self.bk.close()
  
  def defaulterror(req, excinfo):
 -    import resp
 +    from . import resp
      traceback.print_exception(*excinfo)
      raise resp.httperror(500)
  
@@@ -62,9 -62,9 +62,9 @@@ def handle(req, startreq, handler)
              try:
                  resp = iterproxy(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())
@@@ -73,3 -73,9 +73,9 @@@
          return resp
      finally:
          req.cleanup()
+ 
+ def handleenv(env, startreq, handler):
+     if not "HTTP_HOST" in env:
+         return proto.simpleerror(env, startreq, 400, "Bad Request", "Request must include Host header.")
+     r = req.origrequest(env)
+     return handle(r, startreq, handler)

diff --combined wrw/util.py
index a7f1e4c,6368b18..5347ce4
--- 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.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)
@@@ -64,7 -55,7 +64,7 @@@ class sessiondata(object)
  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 -67,18 +76,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 -121,7 +130,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 -133,8 +142,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 -142,7 +150,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__()