From cdd24bd6f2db08914298e2b54a377c6deb0ff792 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 30 Sep 2012 15:42:30 +0200 Subject: [PATCH] Fixed some leftover inconsistenciesin lockhandler, thanks to Shell pointing it out. --- src/locks/lockhandler.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/locks/lockhandler.py b/src/locks/lockhandler.py index 069b66fbb0..d0e8bd2190 100644 --- a/src/locks/lockhandler.py +++ b/src/locks/lockhandler.py @@ -109,7 +109,7 @@ from django.conf import settings from src.utils import logger, utils from django.utils.translation import ugettext as _ -__all__ = ("LockHandler", ) +__all__ = ("LockHandler", "LockException") # # Exception class @@ -168,7 +168,6 @@ class LockHandler(object): self.obj = obj self.locks = {} self.log_obj = None - self.no_errors = True self.reset_flag = False self._cache_locks(self.obj.lock_storage) # we handle bypass checks already here for efficiency. We need to grant access to superusers and @@ -244,7 +243,6 @@ class LockHandler(object): if elist: # an error text was set, raise exception. raise LockException("\n".join(elist)) - self.no_errors = False # return the gathered locks in an easily executable form return locks @@ -265,7 +263,6 @@ class LockHandler(object): """ if log_obj: self.log_obj = log_obj - self.no_errors = True # sanity checks for lockdef in lockstring.split(';'): if not ':' in lockstring: @@ -291,7 +288,7 @@ class LockHandler(object): self._cache_locks(storage_lockstring) self._save_locks() self.log_obj = None - return self.no_errors + return True def get(self, access_type): "get the lockstring of a particular type"