[pypy-commit] pypy default: use an explicit initialized variable for clarity

[bdkearns]

Author: Brian Kearns <bdkea...@gmail.com>
Branch: 
Changeset: r62108:4241c22e47ae
Date: 2013-03-05 20:30 -0500
http://bitbucket.org/pypy/pypy/changeset/4241c22e47ae/

Log:    use an explicit initialized variable for clarity

diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -306,7 +306,7 @@
 
 
 class Connection(object):
-    db = None
+    initialized = False
 
     def __init__(self, database, timeout=5.0, detect_types=0, 
isolation_level="",
                  check_same_thread=True, factory=None, cached_statements=100):
@@ -344,10 +344,12 @@
         self._collations = {}
         if check_same_thread:
             self.thread_ident = thread_get_ident()
+        self.initialized = True
 
     def __del__(self):
-        if self.db:
-            sqlite.sqlite3_close(self.db)
+        if self.initialized:
+            if self.db:
+                sqlite.sqlite3_close(self.db)
 
     def close(self):
         self._check_thread()
@@ -361,10 +363,10 @@
             ret = sqlite.sqlite3_close(self.db)
             if ret != SQLITE_OK:
                 raise self._get_exception(ret)
-            self.db.value = 0
+            self.db = None
 
     def _check_closed(self):
-        if self.db is None:
+        if not self.initialized:
             raise ProgrammingError("Base Connection.__init__ not called.")
         if not self.db:
             raise ProgrammingError("Cannot operate on a closed database.")
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit