Author: Brian Kearns <bdkea...@gmail.com>
Branch: 
Changeset: r62109:9939c0c252b8
Date: 2013-03-05 20:40 -0500
http://bitbucket.org/pypy/pypy/changeset/9939c0c252b8/

Log:    these should go before try: finally block

diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -468,11 +468,11 @@
         if self._isolation_level is None:
             return
         if sqlite.sqlite3_get_autocommit(self.db):
+            sql = "BEGIN " + self._isolation_level
+            statement = c_void_p()
+            next_char = c_char_p()
+            ret = sqlite.sqlite3_prepare_v2(self.db, sql, -1, 
byref(statement), next_char)
             try:
-                sql = "BEGIN " + self._isolation_level
-                statement = c_void_p()
-                next_char = c_char_p()
-                ret = sqlite.sqlite3_prepare_v2(self.db, sql, -1, 
byref(statement), next_char)
                 if ret != SQLITE_OK:
                     raise self._get_exception(ret)
                 ret = sqlite.sqlite3_step(statement)
@@ -492,11 +492,11 @@
             if obj is not None:
                 obj.reset()
 
+        sql = "COMMIT"
+        statement = c_void_p()
+        next_char = c_char_p()
+        ret = sqlite.sqlite3_prepare_v2(self.db, sql, -1, byref(statement), 
next_char)
         try:
-            sql = "COMMIT"
-            statement = c_void_p()
-            next_char = c_char_p()
-            ret = sqlite.sqlite3_prepare_v2(self.db, sql, -1, 
byref(statement), next_char)
             if ret != SQLITE_OK:
                 raise self._get_exception(ret)
             ret = sqlite.sqlite3_step(statement)
@@ -521,11 +521,11 @@
             if cursor:
                 cursor.reset = True
 
+        sql = "ROLLBACK"
+        statement = c_void_p()
+        next_char = c_char_p()
+        ret = sqlite.sqlite3_prepare_v2(self.db, sql, -1, byref(statement), 
next_char)
         try:
-            sql = "ROLLBACK"
-            statement = c_void_p()
-            next_char = c_char_p()
-            ret = sqlite.sqlite3_prepare_v2(self.db, sql, -1, 
byref(statement), next_char)
             if ret != SQLITE_OK:
                 raise self._get_exception(ret)
             ret = sqlite.sqlite3_step(statement)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to