Django

Code

Changeset 3818

Show
Ignore:
Timestamp:
09/24/06 20:53:34 (2 years ago)
Author:
mtredinnick
Message:

Fixed #2772 -- Made SQLite support work correctly with Python 2.5 standard
module (as well as pysqlite2 for earlier Python versions). Patch from
ymasuda[at]ethercube.com.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r3723 r3818  
    55from django.db.backends import util 
    66try: 
    7     from pysqlite2 import dbapi2 as Database 
     7    try: 
     8        from sqlite3 import dbapi2 as Database 
     9    except ImportError: 
     10        from pysqlite2 import dbapi2 as Database 
    811except ImportError, e: 
     12    import sys 
    913    from django.core.exceptions import ImproperlyConfigured 
    10     raise ImproperlyConfigured, "Error loading pysqlite2 module: %s" % e 
     14    if sys.version_info < (2, 5, 0): 
     15        module = 'pysqlite2' 
     16    else: 
     17        module = 'sqlite3' 
     18    raise ImproperlyConfigured, "Error loading %s module: %s" % (module, e) 
    1119 
    1220DatabaseError = Database.DatabaseError