diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2011-09-09 17:14:47 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2011-09-09 17:14:47 +0000 |
| commit | d036b87126eadb3d76a4e4c5daea1bfb767db912 (patch) | |
| tree | 07d4cad828482c0ac7a7f4221cdd70439ef2a748 /django | |
| parent | 4584069c8aa43a10bef8d0711fc4451599bb4dcf (diff) | |
Remove no-longer-valid references to the DATABASE_* settings, the legacy code for them was already removed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/conf/global_settings.py | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 7b7531a974..10d61920ed 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -142,16 +142,6 @@ SERVER_EMAIL = 'root@localhost' SEND_BROKEN_LINK_EMAILS = False # Database connection info. -# Legacy format -DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. -DATABASE_NAME = '' # Or path to database file if using sqlite3. -DATABASE_USER = '' # Not used with sqlite3. -DATABASE_PASSWORD = '' # Not used with sqlite3. -DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. -DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. -DATABASE_OPTIONS = {} # Set to empty dictionary for default. - -# New format DATABASES = { } @@ -558,17 +548,6 @@ DEFAULT_EXCEPTION_REPORTER_FILTER = 'django.views.debug.SafeExceptionReporterFil # The name of the class to use to run the test suite TEST_RUNNER = 'django.test.simple.DjangoTestSuiteRunner' -# The name of the database to use for testing purposes. -# If None, a name of 'test_' + DATABASE_NAME will be assumed -TEST_DATABASE_NAME = None - -# Strings used to set the character set and collation order for the test -# database. These values are passed literally to the server, so they are -# backend-dependent. If None, no special settings are sent (system defaults are -# used). -TEST_DATABASE_CHARSET = None -TEST_DATABASE_COLLATION = None - ############ # FIXTURES # ############ |