From af00f29ecb7647e455d3207a4af1c587d7d53e2f Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 2 Apr 2011 08:37:53 +0000 Subject: [PATCH] Advanced deprecations in core.mail, core.commands, core.context_processors and core.handlers. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15978 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/context_processors.py | 22 ++-------------------- django/core/handlers/modpython.py | 2 +- django/core/mail/__init__.py | 10 ---------- django/core/management/commands/reset.py | 2 +- django/core/management/commands/test.py | 14 ++------------ django/core/management/sql.py | 2 +- 6 files changed, 7 insertions(+), 45 deletions(-) diff --git a/django/core/context_processors.py b/django/core/context_processors.py index 90e89b73d8..5597f68a55 100644 --- a/django/core/context_processors.py +++ b/django/core/context_processors.py @@ -11,24 +11,6 @@ from django.conf import settings from django.middleware.csrf import get_token from django.utils.functional import lazy -def auth(request): - """ - DEPRECATED. This context processor is the old location, and has been moved - to `django.contrib.auth.context_processors`. - - This function still exists for backwards-compatibility; it will be removed - in Django 1.4. - """ - import warnings - warnings.warn( - "The context processor at `django.core.context_processors.auth` is " \ - "deprecated; use the path `django.contrib.auth.context_processors.auth` " \ - "instead.", - DeprecationWarning - ) - from django.contrib.auth.context_processors import auth as auth_context_processor - return auth_context_processor(request) - def csrf(request): """ Context processor that provides a CSRF token, or the string 'NOTPROVIDED' if @@ -97,7 +79,7 @@ class PermLookupDict(RealPermLookupDict): "`django.core.context_processors.PermLookupDict` is " \ "deprecated; use `django.contrib.auth.context_processors.PermLookupDict` " \ "instead.", - PendingDeprecationWarning + DeprecationWarning ) super(PermLookupDict, self).__init__(*args, **kwargs) @@ -108,6 +90,6 @@ class PermWrapper(RealPermWrapper): "`django.core.context_processors.PermWrapper` is " \ "deprecated; use `django.contrib.auth.context_processors.PermWrapper` " \ "instead.", - PendingDeprecationWarning + DeprecationWarning ) super(PermWrapper, self).__init__(*args, **kwargs) diff --git a/django/core/handlers/modpython.py b/django/core/handlers/modpython.py index 7b25f0e11e..e5c7467072 100644 --- a/django/core/handlers/modpython.py +++ b/django/core/handlers/modpython.py @@ -160,7 +160,7 @@ class ModPythonHandler(BaseHandler): def __call__(self, req): warn(('The mod_python handler is deprecated; use a WSGI or FastCGI server instead.'), - PendingDeprecationWarning) + DeprecationWarning) # mod_python fakes the environ, and thus doesn't process SetEnv. This fixes that os.environ.update(req.subprocess_env) diff --git a/django/core/mail/__init__.py b/django/core/mail/__init__.py index 008950b7ae..2c71b11541 100644 --- a/django/core/mail/__init__.py +++ b/django/core/mail/__init__.py @@ -107,13 +107,3 @@ def mail_managers(subject, message, fail_silently=False, connection=None, if html_message: mail.attach_alternative(html_message, 'text/html') mail.send(fail_silently=fail_silently) - - -class SMTPConnection(_SMTPConnection): - def __init__(self, *args, **kwds): - import warnings - warnings.warn( - 'mail.SMTPConnection is deprecated; use mail.get_connection() instead.', - DeprecationWarning - ) - super(SMTPConnection, self).__init__(*args, **kwds) diff --git a/django/core/management/commands/reset.py b/django/core/management/commands/reset.py index 388045f726..8aa7e88626 100644 --- a/django/core/management/commands/reset.py +++ b/django/core/management/commands/reset.py @@ -24,7 +24,7 @@ class Command(AppCommand): import warnings warnings.warn( 'This command has been deprecated. The command ``flush`` can be used to delete everything. You can also use ALTER TABLE or DROP TABLE statements manually.', - PendingDeprecationWarning + DeprecationWarning ) using = options.get('database', DEFAULT_DB_ALIAS) connection = connections[using] diff --git a/django/core/management/commands/test.py b/django/core/management/commands/test.py index 1431f0059f..1be1e1e768 100644 --- a/django/core/management/commands/test.py +++ b/django/core/management/commands/test.py @@ -23,18 +23,8 @@ class Command(BaseCommand): failfast = options.get('failfast', False) TestRunner = get_runner(settings) - if hasattr(TestRunner, 'func_name'): - # Pre 1.2 test runners were just functions, - # and did not support the 'failfast' option. - import warnings - warnings.warn( - 'Function-based test runners are deprecated. Test runners should be classes with a run_tests() method.', - DeprecationWarning - ) - failures = TestRunner(test_labels, verbosity=verbosity, interactive=interactive) - else: - test_runner = TestRunner(verbosity=verbosity, interactive=interactive, failfast=failfast) - failures = test_runner.run_tests(test_labels) + test_runner = TestRunner(verbosity=verbosity, interactive=interactive, failfast=failfast) + failures = test_runner.run_tests(test_labels) if failures: sys.exit(bool(failures)) diff --git a/django/core/management/sql.py b/django/core/management/sql.py index 429f470637..dc3fc5794e 100644 --- a/django/core/management/sql.py +++ b/django/core/management/sql.py @@ -102,7 +102,7 @@ def sql_reset(app, style, connection): import warnings warnings.warn( 'This command has been deprecated. The command ``sqlflush`` can be used to delete everything. You can also use ALTER TABLE or DROP TABLE statements manually.', - PendingDeprecationWarning + DeprecationWarning ) return sql_delete(app, style, connection) + sql_all(app, style, connection)