[SQL-CVS] r1760 - home/phd/SQLObject/paramstyles/sqlobject

[<sub...@co...>]

Author: phd
Date: 2006-05-09 10:37:31 -0600 (Tue, 09 May 2006)
New Revision: 1760

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/declarative.py
Log:
Merged patches from the revisions 1757:1759 from the trunk: a patch by David Creemer <da...@za...>: release the lock even after an exception to prevent deadlocks.

Modified: home/phd/SQLObject/paramstyles/sqlobject/declarative.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/declarative.py	2006-05-09 16:35:34 UTC (rev 1759)
+++ home/phd/SQLObject/paramstyles/sqlobject/declarative.py	2006-05-09 16:37:31 UTC (rev 1760)
@@ -90,9 +90,10 @@
     def decorator(fn):
         def _wrapper(self, *args, **kwargs):
             lock.acquire()
-            return_value = fn(self, *args, **kwargs)
-            lock.release()
-            return return_value
+            try:
+                return fn(self, *args, **kwargs)
+            finally:
+                lock.release()
         try:
             _wrapper.func_name = fn.func_name
         except TypeError: