diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-01-29 15:45:55 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-01-29 15:45:55 +0000 |
| commit | 11ee9746a0530ec38f523fb4de44950d9b783877 (patch) | |
| tree | 7fd170a1d1231b294694b28a796f8b0ad5b70b8f /django/db/__init__.py | |
| parent | 47acb1d659c0c589b6c6532f8618da0bb757324c (diff) | |
Fixed #12702 -- Introduced a common implementation of DatabaseError and IntegrityError, so that database backends can (re)raise common error classes. Thanks for Waldemar Kornewald for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12352 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/__init__.py')
| -rw-r--r-- | django/db/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/django/db/__init__.py b/django/db/__init__.py index 69996e6ad5..4bae04ab9a 100644 --- a/django/db/__init__.py +++ b/django/db/__init__.py @@ -1,7 +1,8 @@ from django.conf import settings from django.core import signals from django.core.exceptions import ImproperlyConfigured -from django.db.utils import ConnectionHandler, ConnectionRouter, load_backend, DEFAULT_DB_ALIAS +from django.db.utils import ConnectionHandler, ConnectionRouter, load_backend, DEFAULT_DB_ALIAS, \ + DatabaseError, IntegrityError from django.utils.functional import curry __all__ = ('backend', 'connection', 'connections', 'router', 'DatabaseError', @@ -73,8 +74,6 @@ router = ConnectionRouter(settings.DATABASE_ROUTERS) # connections['default'] instead. connection = connections[DEFAULT_DB_ALIAS] backend = load_backend(connection.settings_dict['ENGINE']) -DatabaseError = backend.DatabaseError -IntegrityError = backend.IntegrityError # Register an event that closes the database connection # when a Django request is finished. |