[MERGE] upstream

bzr revid: fme@openerp.com-20140423123808-q58dtl8a0bb2ymlf

1 files changed, 6 insertions, 5 deletions

diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index fcc60e7b6f3..3e401347a18 100644
--- 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)