Ticket #9628: 9628-r9791-optionD.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 can use a pysqlite2 module or the sqlite3 module in the
+standard library.
 """
 
 from django.db.backends import *
@@ -14 +15 @@
 
 try:
     try:
+        from pysqlite2 import dbapi2 as Database
+    except ImportError, e1:
         from sqlite3 import dbapi2 as Database
-    except ImportError, e1:
-        from pysqlite2 import dbapi2 as Database
 except ImportError, exc:
     import sys
     from django.core.exceptions import ImproperlyConfigured
     if sys.version_info < (2, 5, 0):
-        module = 'pysqlite2'
+        module = 'pysqlite2 module'
+        exc = e1
     else:
-        module = 'sqlite3'
-        exc = e1
-    raise ImproperlyConfigured, "Error loading %s module: %s" % (module, exc)
+        module = 'either pysqlite2 or sqlite3 modules (tried in that order)'
+    raise ImproperlyConfigured, "Error loading %s: %s" % (module, exc)
 
 try:
     import decimal