Merge branch 'master' into python3

[wrw.git] / wrw / util.py

diff --git a/wrw/util.py b/wrw/util.py
index 7a29ea8..35cd3ae 100644 (file)
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,5 +1,5 @@
 import inspect
-import req, dispatch, session, form
+from . import req, dispatch, session, form
 
 def wsgiwrap(callable):
     def wrapper(env, startreq):
@@ -53,7 +53,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
@@ -65,18 +65,18 @@ class autodirty(sessiondata):
         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):