Merge branch 'master' into python2

diff --combined wrw/util.py
index 7459b6d,557b25d..f70680e
--- 1/wrw/util.py
--- 2/wrw/util.py
+++ b/wrw/util.py
@@@ -1,5 -1,5 +1,5 @@@
  import inspect, math
 -from . import req, dispatch, session, form, resp, proto
 +import req, dispatch, session, form, resp, proto
  
  def wsgiwrap(callable):
      def wrapper(env, startreq):
@@@ -17,7 -17,7 +17,7 @@@ def formparams(callable)
              for arg in list(args):
                  if arg not in spec.args:
                      del args[arg]
 -        for i in range(len(spec.args) - (len(spec.defaults) if spec.defaults else 0)):
 +        for i in xrange(len(spec.args) - (len(spec.defaults) if spec.defaults else 0)):
              if spec.args[i] not in args:
                  raise resp.httperror(400, "Missing parameter", ("The query parameter `", resp.h.code(spec.args[i]), "' is required but not supplied."))
          return callable(**args)
@@@ -85,12 -85,12 +85,12 @@@ class preiter(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 self.end:
              raise StopIteration()
          ret = self._next
@@@ -110,6 -110,16 +110,6 @@@ def pregen(callable)
      wrapper.__wrapped__ = callable
      return wrapper
  
 -def stringwrap(charset):
 -    def dec(callable):
 -        @pregen
 -        def wrapper(*args, **kwargs):
 -            for string in callable(*args, **kwargs):
 -                yield string.encode(charset)
 -        wrapper.__wrapped__ = callable
 -        return wrapper
 -    return dec
 -
  class sessiondata(object):
      @classmethod
      def get(cls, req, create=True):
@@@ -131,7 -141,7 +131,7 @@@
  class autodirty(sessiondata):
      @classmethod
      def get(cls, req):
 -        ret = super().get(req)
 +        ret = super(autodirty, cls).get(req)
          if "_is_dirty" not in ret.__dict__:
              ret.__dict__["_is_dirty"] = False
          return ret
@@@ -143,18 -153,18 +143,18 @@@
          return self._is_dirty
  
      def __setattr__(self, name, value):
 -        super().__setattr__(name, value)
 +        super(autodirty, self).__setattr__(name, value)
          if "_is_dirty" in self.__dict__:
              self.__dict__["_is_dirty"] = True
  
      def __delattr__(self, name):
 -        super().__delattr__(name, value)
 +        super(autodirty, self).__delattr__(name, value)
          if "_is_dirty" in self.__dict__:
              self.__dict__["_is_dirty"] = True
  
  class manudirty(object):
      def __init__(self, *args, **kwargs):
 -        super().__init__(*args, **kwargs)
 +        super(manudirty, self).__init__(*args, **kwargs)
          self.__dirty = False
  
      def sessfrozen(self):
@@@ -197,7 -207,7 +197,7 @@@ class specslot(object)
  
  class specclass(type):
      def __init__(self, name, bases, tdict):
 -        super().__init__(name, bases, tdict)
 +        super(specclass, self).__init__(name, bases, tdict)
          sslots = set()
          dslots = set()
          for cls in self.__mro__:
@@@ -209,8 -219,7 +209,8 @@@
          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):
@@@ -218,7 -227,7 +218,7 @@@
  
      @staticmethod
      def __new__(cls, req, sess):
 -        self = super().__new__(cls)
 +        self = super(specdirty, cls).__new__(cls)
          self.session = sess
          self.__sslots__ = [specslot.unbound] * len(cls.__sslots_a__)
          self.__specinit__()
@@@ -258,6 -267,6 +258,6 @@@
  def datecheck(req, mtime):
      if "If-Modified-Since" in req.ihead:
          rtime = proto.phttpdate(req.ihead["If-Modified-Since"])
-         if rtime >= math.floor(mtime):
+         if rtime is not None and rtime >= math.floor(mtime):
              raise resp.unmodified()
      req.ohead["Last-Modified"] = proto.httpdate(mtime)