p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #9628 -- Use `pysqlite2` for database backend, if installed. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2009-03-20 03:57:21 +00:00
parent fa89fdcd6b
commit 6e3b129f15
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
django/db/backends/sqlite3/base.py
View File

@ -3,7 +3,8 @@ SQLite3 backend for django.
Python 2.3 and 2.4 require pysqlite2 (http://pysqlite.org/). 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 * from django.db.backends import *
@ -14,18 +15,18 @@ from django.utils.safestring import SafeString
try: try:
try: try:
from sqlite3 import dbapi2 as Database
except ImportError, e1:
from pysqlite2 import dbapi2 as Database from pysqlite2 import dbapi2 as Database
except ImportError, e1:
from sqlite3 import dbapi2 as Database
except ImportError, exc: except ImportError, exc:
import sys import sys
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
if sys.version_info < (2, 5, 0): if sys.version_info < (2, 5, 0):
module = 'pysqlite2' module = 'pysqlite2 module'
else:
module = 'sqlite3'
exc = e1 exc = e1
raise ImproperlyConfigured, "Error loading %s module: %s" % (module, exc) else:
module = 'either pysqlite2 or sqlite3 modules (tried in that order)'
raise ImproperlyConfigured, "Error loading %s: %s" % (module, exc)
try: try:
import decimal import decimal