Author: Alex
Date: 2011-03-30 10:59:44 -0700 (Wed, 30 Mar 2011)
New Revision: 15959
Modified:
django/trunk/django/db/__init__.py
django/trunk/django/db/utils.py
Log:
Removed legacy handing for `settings.DATABAS_*` and using short-form references
to the included database backends.
Modified: django/trunk/django/db/__init__.py
===================================================================
--- django/trunk/django/db/__init__.py 2011-03-30 17:48:42 UTC (rev 15958)
+++ django/trunk/django/db/__init__.py 2011-03-30 17:59:44 UTC (rev 15959)
@@ -8,59 +8,9 @@
'IntegrityError', 'DEFAULT_DB_ALIAS')
-# For backwards compatibility - Port any old database settings over to
-# the new values.
-if not settings.DATABASES:
- if settings.DATABASE_ENGINE:
- import warnings
- warnings.warn(
- "settings.DATABASE_* is deprecated; use settings.DATABASES
instead.",
- DeprecationWarning
- )
-
- settings.DATABASES[DEFAULT_DB_ALIAS] = {
- 'ENGINE': settings.DATABASE_ENGINE,
- 'HOST': settings.DATABASE_HOST,
- 'NAME': settings.DATABASE_NAME,
- 'OPTIONS': settings.DATABASE_OPTIONS,
- 'PASSWORD': settings.DATABASE_PASSWORD,
- 'PORT': settings.DATABASE_PORT,
- 'USER': settings.DATABASE_USER,
- 'TEST_CHARSET': settings.TEST_DATABASE_CHARSET,
- 'TEST_COLLATION': settings.TEST_DATABASE_COLLATION,
- 'TEST_NAME': settings.TEST_DATABASE_NAME,
- }
-
if DEFAULT_DB_ALIAS not in settings.DATABASES:
raise ImproperlyConfigured("You must define a '%s' database" %
DEFAULT_DB_ALIAS)
-for alias, database in settings.DATABASES.items():
- if 'ENGINE' not in database:
- raise ImproperlyConfigured("You must specify a 'ENGINE' for database
'%s'" % alias)
- if database['ENGINE'] in ("postgresql", "postgresql_psycopg2", "sqlite3",
"mysql", "oracle"):
- import warnings
- if 'django.contrib.gis' in settings.INSTALLED_APPS:
- warnings.warn(
- "django.contrib.gis is now implemented as a full database
backend. "
- "Modify ENGINE in the %s database configuration to select "
- "a backend from 'django.contrib.gis.db.backends'" % alias,
- DeprecationWarning
- )
- if database['ENGINE'] == 'postgresql_psycopg2':
- full_engine = 'django.contrib.gis.db.backends.postgis'
- elif database['ENGINE'] == 'sqlite3':
- full_engine = 'django.contrib.gis.db.backends.spatialite'
- else:
- full_engine = 'django.contrib.gis.db.backends.%s' %
database['ENGINE']
- else:
- warnings.warn(
- "Short names for ENGINE in database configurations are
deprecated. "
- "Prepend %s.ENGINE with 'django.db.backends.'" % alias,
- DeprecationWarning
- )
- full_engine = "django.db.backends.%s" % database['ENGINE']
- database['ENGINE'] = full_engine
-
connections = ConnectionHandler(settings.DATABASES)
router = ConnectionRouter(settings.DATABASE_ROUTERS)
Modified: django/trunk/django/db/utils.py
===================================================================
--- django/trunk/django/db/utils.py 2011-03-30 17:48:42 UTC (rev 15958)
+++ django/trunk/django/db/utils.py 2011-03-30 17:59:44 UTC (rev 15959)
@@ -1,4 +1,3 @@
-import inspect
import os
from django.conf import settings
@@ -19,38 +18,29 @@
def load_backend(backend_name):
+ # Look for a fully qualified database backend name
try:
- module = import_module('.base', 'django.db.backends.%s' % backend_name)
- import warnings
- warnings.warn(
- "Short names for DATABASE_ENGINE are deprecated; prepend with
'django.db.backends.'",
- DeprecationWarning
- )
- return module
- except ImportError, e:
- # Look for a fully qualified database backend name
+ return import_module('.base', backend_name)
+ except ImportError, e_user:
+ # The database backend wasn't found. Display a helpful error message
+ # listing all possible (built-in) database backends.
+ backend_dir = os.path.join(os.path.dirname(__file__), 'backends')
try:
- return import_module('.base', backend_name)
- except ImportError, e_user:
- # The database backend wasn't found. Display a helpful error
message
- # listing all possible (built-in) database backends.
- backend_dir = os.path.join(os.path.dirname(__file__), 'backends')
- try:
- available_backends = [f for f in os.listdir(backend_dir)
- if os.path.isdir(os.path.join(backend_dir, f))
- and not f.startswith('.')]
- except EnvironmentError:
- available_backends = []
- if backend_name.startswith('django.db.backends.'):
- backend_name = backend_name[19:] # See #15621.
- if backend_name not in available_backends:
- error_msg = ("%r isn't an available database backend. \n" +
- "Try using django.db.backends.XXX, where XXX is one of:\n
%s\n" +
- "Error was: %s") % \
- (backend_name, ", ".join(map(repr,
sorted(available_backends))), e_user)
- raise ImproperlyConfigured(error_msg)
- else:
- raise # If there's some other error, this must be an error in
Django itself.
+ available_backends = [f for f in os.listdir(backend_dir)
+ if os.path.isdir(os.path.join(backend_dir, f))
+ and not f.startswith('.')]
+ except EnvironmentError:
+ available_backends = []
+ if backend_name.startswith('django.db.backends.'):
+ backend_name = backend_name[19:] # See #15621.
+ if backend_name not in available_backends:
+ error_msg = ("%r isn't an available database backend. \n" +
+ "Try using django.db.backends.XXX, where XXX is one of:\n
%s\n" +
+ "Error was: %s") % \
+ (backend_name, ", ".join(map(repr,
sorted(available_backends))), e_user)
+ raise ImproperlyConfigured(error_msg)
+ else:
+ raise # If there's some other error, this must be an error in
Django itself.
class ConnectionDoesNotExist(Exception):
@@ -76,13 +66,11 @@
if conn['ENGINE'] == 'django.db.backends.' or not conn['ENGINE']:
conn['ENGINE'] = 'django.db.backends.dummy'
conn.setdefault('OPTIONS', {})
- conn.setdefault('TEST_CHARSET', None)
- conn.setdefault('TEST_COLLATION', None)
- conn.setdefault('TEST_NAME', None)
- conn.setdefault('TEST_MIRROR', None)
conn.setdefault('TIME_ZONE', settings.TIME_ZONE)
- for setting in ('NAME', 'USER', 'PASSWORD', 'HOST', 'PORT'):
+ for setting in ['NAME', 'USER', 'PASSWORD', 'HOST', 'PORT']:
conn.setdefault(setting, '')
+ for setting in ['TEST_CHARSET', 'TEST_COLLATION', 'TEST_NAME',
'TEST_MIRROR']:
+ conn.setdefault(setting, None)
def __getitem__(self, alias):
if alias in self._connections:
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
