X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=db74e623606d9d7f04504f68a0ce05a02ac420b7;hb=d13a1a574515e4c4a40ed0090c8c684cc9e523f2;hp=3da6053ba61ec954c30bf232365d7be2f5810f44;hpb=d1f70c6c18e44a82ded765f4d53668ea3e5d34a1;p=wrw.git diff --git a/wrw/util.py b/wrw/util.py index 3da6053..db74e62 100644 --- a/wrw/util.py +++ b/wrw/util.py @@ -1,4 +1,4 @@ -import req, dispatch, session +from . import req, dispatch, session def wsgiwrap(callable): def wrapper(env, startreq): @@ -29,7 +29,6 @@ class sessiondata(object): return sess[cls] except KeyError: ret = cls(req) - ret._is_dirty = [False] sess[cls] = ret return ret @@ -37,17 +36,39 @@ class sessiondata(object): def sessdb(cls): return session.default +class autodirty(sessiondata): + @classmethod + def get(cls, req): + ret = super().get(req) + if "_is_dirty" not in ret.__dict__: + ret.__dict__["_is_dirty"] = False + def sessfrozen(self): - self._is_dirty[:] = [False] + self.__dict__["_is_dirty"] = False def sessdirty(self): - return self._is_dirty[0] + return self._is_dirty def __setattr__(self, name, value): - if hasattr(self, "_is_dirty"): - self._is_dirty[:] = [True] - super(sessiondata, self).__setattr__(name, value) + super().__setattr__(name, value) + if "_is_dirty" in self.__dict__: + self.__dict__["_is_dirty"] = True def __delattr__(self, name): - super(sessiondata, self).__delattr__(name) - self._is_dirty[:] = [True] + super().__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) + self.__dirty = False + + def sessfrozen(self): + self.__dirty = False + + def sessdirty(self): + return self.__dirty + + def dirty(self): + self.__dirty = True