[FIX] Report: get the wkhtmltopdf version in a cleaner way with a simple regex

[odoo/odoo.git] / openerp / sql_db.py

diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index 329017a..3e40134 100644 (file)
--- a/openerp/sql_db.py
+++ b/openerp/sql_db.py
@@ -399,12 +399,13 @@ class TestCursor(Cursor):
     def release(self):
         self._lock.release()
 
-    def close(self, force=False):
-        if force:
-            super(TestCursor, self).close()
-        elif not self._closed:
+    def force_close(self):
+        super(TestCursor, self).close()
+
+    def close(self):
+        if not self._closed:
             self.rollback()             # for stuff that has not been committed
-            self.release()
+        self.release()
 
     def autocommit(self, on):
         _logger.debug("TestCursor.autocommit(%r) does nothing", on)
@@ -547,7 +548,7 @@ class Connection(object):
     def test_cursor(self, serialized=True):
         cursor_type = serialized and 'serialized ' or ''
         _logger.debug('create test %scursor to %r', cursor_type, self.dbname)
-        return TestCursor(self._pool, self.dbname, serialized=serialized)
+        return TestCursor(self.__pool, self.dbname, serialized=serialized)
 
     # serialized_cursor is deprecated - cursors are serialized by default
     serialized_cursor = cursor