[Neo-report] r2832 jm - in /trunk/neo/storage: app.py database/manager.py

[nobody at svn.erp5.org]

Author: jm
Date: Thu Sep  8 19:50:57 2011
New Revision: 2832

Log:
Rewrite previous commit in a way it does not break threaded tests

Modified:
    trunk/neo/storage/app.py
    trunk/neo/storage/database/manager.py

Modified: trunk/neo/storage/app.py
==============================================================================
--- trunk/neo/storage/app.py [iso-8859-1] (original)
+++ trunk/neo/storage/app.py [iso-8859-1] Thu Sep  8 19:50:57 2011
@@ -92,8 +92,10 @@ class Application(object):
         self.listening_conn = None
         self.nm.close()
         self.em.close()
-        if self.dm is not None:
+        try:
             self.dm.close()
+        except AttributeError:
+            pass
         del self.__dict__
 
     def _poll(self):

Modified: trunk/neo/storage/database/manager.py
==============================================================================
--- trunk/neo/storage/database/manager.py [iso-8859-1] (original)
+++ trunk/neo/storage/database/manager.py [iso-8859-1] Thu Sep  8 19:50:57 2011
@@ -30,9 +30,6 @@ class DatabaseManager(object):
         """
         self._under_transaction = False
 
-    def close(self):
-        pass
-
     def isUnderTransaction(self):
         return self._under_transaction