Django

Code

Changeset 2993

Show
Ignore:
Timestamp:
05/26/06 13:58:46 (2 years ago)
Author:
adrian
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/db/backends/ado_mssql/base.py

    r2873 r2993  
    66 
    77from django.db.backends import util 
    8 import adodbapi as Database 
     8try: 
     9    import adodbapi as Database 
     10except ImportError, e: 
     11    from django.core.exceptions import ImproperlyConfigured 
     12    raise ImproperlyConfigured, "Error loading adodbapi module: %s" % e 
    913import datetime 
    1014try: 

  • django/trunk/django/db/backends/mysql/base.py

    r2809 r2993  
    66 
    77from django.db.backends import util 
    8 import MySQLdb as Database 
     8try: 
     9    import MySQLdb as Database 
     10except ImportError, e: 
     11    from django.core.exceptions import ImproperlyConfigured 
     12    raise ImproperlyConfigured, "Error loading MySQLdb module: %s" % e 
    913from MySQLdb.converters import conversions 
    1014from MySQLdb.constants import FIELD_TYPE 

  • django/trunk/django/db/backends/oracle/base.py

    r2986 r2993  
    66 
    77from django.db.backends import util 
    8 import cx_Oracle as Database 
     8try: 
     9    import cx_Oracle as Database 
     10except ImportError, e: 
     11    from django.core.exceptions import ImproperlyConfigured 
     12    raise ImproperlyConfigured, "Error loading cx_Oracle module: %s" % e 
    913import types 
    1014 

  • django/trunk/django/db/backends/postgresql/base.py

    r2809 r2993  
    66 
    77from django.db.backends import util 
    8 import psycopg as Database 
     8try: 
     9    import psycopg as Database 
     10except ImportError, e: 
     11    from django.core.exceptions import ImproperlyConfigured 
     12    raise ImproperlyConfigured, "Error loading psycopg module: %s" % e 
    913 
    1014DatabaseError = Database.DatabaseError 

  • django/trunk/django/db/backends/postgresql_psycopg2/base.py

    r2934 r2993  
    66 
    77from django.db.backends import util 
    8 import psycopg2 as Database 
     8try: 
     9    import psycopg2 as Database 
     10except ImportError, e: 
     11    from django.core.exceptions import ImproperlyConfigured 
     12    raise ImproperlyConfigured, "Error loading psycopg2 module: %s" % e 
    913 
    1014DatabaseError = Database.DatabaseError 

  • django/trunk/django/db/backends/sqlite3/base.py

    r2851 r2993  
    44 
    55from django.db.backends import util 
    6 from pysqlite2 import dbapi2 as Database 
     6try: 
     7    from pysqlite2 import dbapi2 as Database 
     8except ImportError, e: 
     9    from django.core.exceptions import ImproperlyConfigured 
     10    raise ImproperlyConfigured, "Error loading pysqlite2 module: %s" % e 
    711 
    812DatabaseError = Database.DatabaseError