Ticket #9628: 9628-r9781.diff

django/db/backends/sqlite3/base.py

@@ -3 +3 @@
 
 Python 2.3 and 2.4 require pysqlite2 (http://pysqlite.org/).
 
-Python 2.5 and later use the sqlite3 module in the standard library.
+Python 2.5 and later use the sqlite3 module in the standard library,
+unless a newer version of pysqlite2 is installed.
 """
 
 from django.db.backends import *
@@ -11 +12 @@
 from django.db.backends.sqlite3.creation import DatabaseCreation
 from django.db.backends.sqlite3.introspection import DatabaseIntrospection
 from django.utils.safestring import SafeString
+import sys
 
-try:
+Database = None
+for pkg in ['sqlite3','pysqlite2']:
     try:
-        from sqlite3 import dbapi2 as Database
-    except ImportError, e1:
-        from pysqlite2 import dbapi2 as Database
-except ImportError, exc:
-    import sys
+        mod = __import__(pkg + '.dbapi2')
+        if not Database or mod.dbapi2.version_info > Database.version_info:
+            Database = sys.modules[pkg + '.dbapi2']
+    except ImportError, exc:
+        pass
+if not Database:
     from django.core.exceptions import ImproperlyConfigured
-    if sys.version_info < (2, 5, 0):
-        module = 'pysqlite2'
-    else:
-        module = 'sqlite3'
-        exc = e1
-    raise ImproperlyConfigured, "Error loading %s module: %s" % (module, exc)
+    raise ImproperlyConfigured, "Error loading %s module: %s" % (pkg, exc)
 
 try:
     import decimal