[pypy-commit] pypy default: only call sqlite3_{finalize, reset} if not already called

bdkearns noreply at buildbot.pypy.org
Wed Mar 6 23:05:15 CET 2013


Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r62147:60a6a2e99263
Date: 2013-03-06 17:04 -0500
http://bitbucket.org/pypy/pypy/changeset/60a6a2e99263/

Log:	only call sqlite3_{finalize,reset} if not already called

diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -1018,15 +1018,16 @@
             sqlite.sqlite3_finalize(self._statement)
 
     def _finalize(self):
-        sqlite.sqlite3_finalize(self._statement)
-        self._statement = None
+        if self._statement:
+            sqlite.sqlite3_finalize(self._statement)
+            self._statement = None
         self._in_use = False
 
     def _reset(self):
-        ret = sqlite.sqlite3_reset(self._statement)
-        self._in_use = False
+        if self._in_use and self._statement:
+            ret = sqlite.sqlite3_reset(self._statement)
+            self._in_use = False
         self._exhausted = False
-        return ret
 
     def _build_row_cast_map(self):
         self.__row_cast_map = []


More information about the pypy-commit mailing list