From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 29 Dec 2011 00:43:51 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=61f96448641cf83a95fdc557c323e7009ba55cd8;hp=-c;p=wrw.git

Merge branch 'master' into python3
---

61f96448641cf83a95fdc557c323e7009ba55cd8
diff --combined wrw/util.py
index db74e62,86a7eab..1c2ed6f
--- a/wrw/util.py
+++ b/wrw/util.py
@@@ -1,4 -1,4 +1,4 @@@
 -import req, dispatch, session
 +from . import req, dispatch, session
  
  def wsgiwrap(callable):
      def wrapper(env, startreq):
@@@ -39,9 -39,10 +39,10 @@@ 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
  
      def sessfrozen(self):
          self.__dict__["_is_dirty"] = False
@@@ -50,18 -51,18 +51,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):