Commit 8e9833f2 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #1673 -- Every database backend now raises ImproperlyConfigured if the... 

Fixed #1673 -- Every database backend now raises ImproperlyConfigured if the relevant Python database module raises ImportError

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 0c8ac097

django/db/backends/ado_mssql/base.py

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ Requires adodbapi 2.0.1: http://adodbapi.sourceforge.net/ 
"""



from django.db.backends import util

try:

    import adodbapi as Database

except ImportError, e:

    from django.core.exceptions import ImproperlyConfigured

    raise ImproperlyConfigured, "Error loading adodbapi module: %s" % e

import datetime

try:

    import mx

django/db/backends/mysql/base.py

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ Requires MySQLdb: http://sourceforge.net/projects/mysql-python 
"""



from django.db.backends import util

try:

    import MySQLdb as Database

except ImportError, e:

    from django.core.exceptions import ImproperlyConfigured

    raise ImproperlyConfigured, "Error loading MySQLdb module: %s" % e

from MySQLdb.converters import conversions

from MySQLdb.constants import FIELD_TYPE

import types

django/db/backends/oracle/base.py

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ Requires cx_Oracle: http://www.python.net/crew/atuining/cx_Oracle/ 
"""



from django.db.backends import util

try:

    import cx_Oracle as Database

except ImportError, e:

    from django.core.exceptions import ImproperlyConfigured

    raise ImproperlyConfigured, "Error loading cx_Oracle module: %s" % e

import types



DatabaseError = Database.Error

django/db/backends/postgresql/base.py

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ Requires psycopg 1: http://initd.org/projects/psycopg1 
"""



from django.db.backends import util

try:

    import psycopg as Database

except ImportError, e:

    from django.core.exceptions import ImproperlyConfigured

    raise ImproperlyConfigured, "Error loading psycopg module: %s" % e



DatabaseError = Database.DatabaseError

django/db/backends/postgresql_psycopg2/base.py

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ Requires psycopg 2: http://initd.org/projects/psycopg2 
"""



from django.db.backends import util

try:

    import psycopg2 as Database

except ImportError, e:

    from django.core.exceptions import ImproperlyConfigured

    raise ImproperlyConfigured, "Error loading psycopg2 module: %s" % e



DatabaseError = Database.DatabaseError