Fixed #9113 -- Improved exception message reporting when importing sqlite3 fails.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9060 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 4 insertions, 3 deletions

diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py
index 64da52e45f..f175bc4cb7 100644
--- a/django/db/backends/sqlite3/base.py
+++ b/django/db/backends/sqlite3/base.py
@@ -14,16 +14,17 @@ from django.db.backends.sqlite3.introspection import DatabaseIntrospection
 try:
     try:
         from sqlite3 import dbapi2 as Database
-    except ImportError:
+    except ImportError, e1:
         from pysqlite2 import dbapi2 as Database
-except ImportError, e:
+except ImportError, exc:
     import sys
     from django.core.exceptions import ImproperlyConfigured
     if sys.version_info < (2, 5, 0):
         module = 'pysqlite2'
     else:
         module = 'sqlite3'
-    raise ImproperlyConfigured, "Error loading %s module: %s" % (module, e)
+        exc = e1
+    raise ImproperlyConfigured, "Error loading %s module: %s" % (module, exc)
 
 try:
     import decimal