Permalink
Browse files

Advanced deprecation warnings for Django 1.7.

  • Loading branch information...
1 parent 8b9b8d3 commit acd7b34aafe352ef604edcb73f75041c5cbba6b9 @aaugustin aaugustin committed Jun 29, 2013
Showing with 80 additions and 81 deletions.
  1. +1 −1 django/conf/urls/shortcut.py
  2. +1 −1 django/contrib/admin/options.py
  3. +4 −4 django/contrib/admin/views/main.py
  4. +1 −1 django/contrib/comments/__init__.py
  5. +1 −1 django/contrib/comments/templatetags/comments.py
  6. +1 −1 django/contrib/contenttypes/generic.py
  7. +2 −2 django/db/__init__.py
  8. +1 −1 django/db/backends/creation.py
  9. +2 −2 django/db/models/fields/related.py
  10. +2 −2 django/db/models/manager.py
  11. +4 −4 django/db/models/options.py
  12. +7 −7 django/db/transaction.py
  13. +1 −1 django/db/utils.py
  14. +1 −1 django/forms/forms.py
  15. +3 −3 django/forms/models.py
  16. +1 −1 django/forms/widgets.py
  17. +1 −1 django/middleware/cache.py
  18. +1 −1 django/middleware/common.py
  19. +1 −1 django/middleware/doc.py
  20. +1 −1 django/middleware/transaction.py
  21. +2 −2 django/template/defaulttags.py
  22. +1 −1 django/test/_doctest.py
  23. +1 −1 django/test/simple.py
  24. +1 −1 django/utils/image.py
  25. +1 −1 django/views/defaults.py
  26. +1 −1 django/views/generic/edit.py
  27. +3 −3 tests/admin_scripts/app_with_import/models.py
  28. +0 −1 tests/admin_scripts/tests.py
  29. +2 −2 tests/cache/tests.py
  30. +1 −1 tests/deprecation/tests.py
  31. +3 −3 tests/generic_views/test_edit.py
  32. +5 −5 tests/middleware/tests.py
  33. +2 −2 tests/model_forms/tests.py
  34. +2 −2 tests/model_forms_regress/tests.py
  35. +1 −1 tests/runtests.py
  36. +1 −1 tests/template_tests/tests.py
  37. +2 −2 tests/test_runner/tests.py
  38. +2 −2 tests/test_suite_override/tests.py
  39. +2 −2 tests/test_utils/tests.py
  40. +4 −4 tests/transactions/tests.py
  41. +6 −6 tests/transactions_regress/tests.py
@@ -3,7 +3,7 @@
from django.conf.urls import patterns
warnings.warn("django.conf.urls.shortcut will be removed in Django 1.8.",
- PendingDeprecationWarning)
+ DeprecationWarning)
urlpatterns = patterns('django.views',
(r'^(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'defaults.shortcut'),
@@ -76,7 +76,7 @@ class IncorrectLookupParameters(Exception):
class RenameBaseModelAdminMethods(forms.MediaDefiningClass, RenameMethodsBase):
renamed_methods = (
- ('queryset', 'get_queryset', PendingDeprecationWarning),
+ ('queryset', 'get_queryset', DeprecationWarning),
)
@@ -52,15 +52,15 @@ def _is_changelist_popup(request):
warnings.warn(
"The `%s` GET parameter has been renamed to `%s`." %
(IS_LEGACY_POPUP_VAR, IS_POPUP_VAR),
- PendingDeprecationWarning, 2)
+ DeprecationWarning, 2)
return True
return False
class RenameChangeListMethods(RenameMethodsBase):
renamed_methods = (
- ('get_query_set', 'get_queryset', PendingDeprecationWarning),
+ ('get_query_set', 'get_queryset', DeprecationWarning),
)
@@ -115,14 +115,14 @@ def __init__(self, request, model, list_display, list_display_links,
def root_query_set(self):
warnings.warn("`ChangeList.root_query_set` is deprecated, "
"use `root_queryset` instead.",
- PendingDeprecationWarning, 2)
+ DeprecationWarning, 2)
return self.root_queryset
@property
def query_set(self):
warnings.warn("`ChangeList.query_set` is deprecated, "
"use `queryset` instead.",
- PendingDeprecationWarning, 2)
+ DeprecationWarning, 2)
return self.queryset
def get_filters_params(self, params=None):
@@ -6,7 +6,7 @@
from django.contrib.comments.forms import CommentForm
from django.utils.importlib import import_module
-warnings.warn("django.contrib.comments is deprecated and will be removed before Django 1.8.", PendingDeprecationWarning)
+warnings.warn("django.contrib.comments is deprecated and will be removed before Django 1.8.", DeprecationWarning)
DEFAULT_COMMENTS_APP = 'django.contrib.comments'
@@ -12,7 +12,7 @@
class RenameBaseCommentNodeMethods(RenameMethodsBase):
renamed_methods = (
- ('get_query_set', 'get_queryset', PendingDeprecationWarning),
+ ('get_query_set', 'get_queryset', DeprecationWarning),
)
@@ -25,7 +25,7 @@
class RenameGenericForeignKeyMethods(RenameMethodsBase):
renamed_methods = (
- ('get_prefetch_query_set', 'get_prefetch_queryset', PendingDeprecationWarning),
+ ('get_prefetch_query_set', 'get_prefetch_queryset', DeprecationWarning),
)
View
@@ -49,7 +49,7 @@ class DefaultBackendProxy(object):
@cached_property
def _backend(self):
warnings.warn("Accessing django.db.backend is deprecated.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
return load_backend(connections[DEFAULT_DB_ALIAS].settings_dict['ENGINE'])
def __getattr__(self, item):
@@ -66,7 +66,7 @@ def __delattr__(self, name):
def close_connection(**kwargs):
warnings.warn(
"close_connection is superseded by close_old_connections.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
# Avoid circular imports
from django.db import transaction
for conn in connections:
@@ -465,7 +465,7 @@ def set_autocommit(self):
"""
warnings.warn(
"set_autocommit was moved from BaseDatabaseCreation to "
- "BaseDatabaseWrapper.", PendingDeprecationWarning, stacklevel=2)
+ "BaseDatabaseWrapper.", DeprecationWarning, stacklevel=2)
return self.connection.set_autocommit(True)
def sql_table_creation_suffix(self):
@@ -144,8 +144,8 @@ def related_query_name(self):
class RenameRelatedObjectDescriptorMethods(RenameMethodsBase):
renamed_methods = (
- ('get_query_set', 'get_queryset', PendingDeprecationWarning),
- ('get_prefetch_query_set', 'get_prefetch_queryset', PendingDeprecationWarning),
+ ('get_query_set', 'get_queryset', DeprecationWarning),
+ ('get_prefetch_query_set', 'get_prefetch_queryset', DeprecationWarning),
)
@@ -50,8 +50,8 @@ def ensure_default_manager(sender, **kwargs):
class RenameManagerMethods(RenameMethodsBase):
renamed_methods = (
- ('get_query_set', 'get_queryset', PendingDeprecationWarning),
- ('get_prefetch_query_set', 'get_prefetch_queryset', PendingDeprecationWarning),
+ ('get_query_set', 'get_queryset', DeprecationWarning),
+ ('get_prefetch_query_set', 'get_prefetch_queryset', DeprecationWarning),
)
@@ -130,7 +130,7 @@ def module_name(self):
"""
warnings.warn(
"Options.module_name has been deprecated in favor of model_name",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
return self.model_name
def _prepare(self, model):
@@ -421,7 +421,7 @@ def get_add_permission(self):
warnings.warn(
"`Options.get_add_permission` has been deprecated in favor "
"of `django.contrib.auth.get_permission_codename`.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
return 'add_%s' % self.model_name
def get_change_permission(self):
@@ -432,7 +432,7 @@ def get_change_permission(self):
warnings.warn(
"`Options.get_change_permission` has been deprecated in favor "
"of `django.contrib.auth.get_permission_codename`.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
return 'change_%s' % self.model_name
def get_delete_permission(self):
@@ -443,7 +443,7 @@ def get_delete_permission(self):
warnings.warn(
"`Options.get_delete_permission` has been deprecated in favor "
"of `django.contrib.auth.get_permission_codename`.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
return 'delete_%s' % self.model_name
def get_all_related_objects(self, local_only=False, include_hidden=False,
View
@@ -101,19 +101,19 @@ def set_clean(using=None):
def is_managed(using=None):
warnings.warn("'is_managed' is deprecated.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
def managed(flag=True, using=None):
warnings.warn("'managed' no longer serves a purpose.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
def commit_unless_managed(using=None):
warnings.warn("'commit_unless_managed' is now a no-op.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
def rollback_unless_managed(using=None):
warnings.warn("'rollback_unless_managed' is now a no-op.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
###############
# Public APIs #
@@ -430,7 +430,7 @@ def autocommit(using=None):
your settings file and want the default behavior in some view functions.
"""
warnings.warn("autocommit is deprecated in favor of set_autocommit.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
def entering(using):
enter_transaction_management(managed=False, using=using)
@@ -448,7 +448,7 @@ def commit_on_success(using=None):
control in Web apps.
"""
warnings.warn("commit_on_success is deprecated in favor of atomic.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
def entering(using):
enter_transaction_management(using=using)
@@ -478,7 +478,7 @@ def commit_manually(using=None):
themselves.
"""
warnings.warn("commit_manually is deprecated in favor of set_autocommit.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
def entering(using):
enter_transaction_management(using=using)
View
@@ -174,7 +174,7 @@ def ensure_defaults(self, alias):
if settings.TRANSACTIONS_MANAGED:
warnings.warn(
"TRANSACTIONS_MANAGED is deprecated. Use AUTOCOMMIT instead.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
conn.setdefault('AUTOCOMMIT', False)
conn.setdefault('AUTOCOMMIT', True)
conn.setdefault('ENGINE', 'django.db.backends.dummy')
View
@@ -352,7 +352,7 @@ def changed_data(self):
if hasattr(field.widget, '_has_changed'):
warnings.warn("The _has_changed method on widgets is deprecated,"
" define it at field level instead.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
if field.widget._has_changed(initial_value, data_value):
self._changed_data.append(name)
elif field._has_changed(initial_value, data_value):
View
@@ -260,7 +260,7 @@ def __new__(cls, name, bases, attrs):
warnings.warn("Creating a ModelForm without either the 'fields' attribute "
"or the 'exclude' attribute is deprecated - form %s "
"needs updating" % name,
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
if opts.fields == ALL_FIELDS:
# sentinel for fields_for_model to indicate "get the list of
@@ -513,7 +513,7 @@ def modelform_factory(model, form=ModelForm, fields=None, exclude=None,
getattr(Meta, 'exclude', None) is None):
warnings.warn("Calling modelform_factory without defining 'fields' or "
"'exclude' explicitly is deprecated",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
# Instatiate type(form) in order to use the same metaclass as form.
return type(form)(class_name, (form,), form_class_attrs)
@@ -796,7 +796,7 @@ def modelformset_factory(model, form=ModelForm, formfield_callback=None,
getattr(meta, 'exclude', exclude) is None):
warnings.warn("Calling modelformset_factory without defining 'fields' or "
"'exclude' explicitly is deprecated",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
form = modelform_factory(model, form=form, fields=fields, exclude=exclude,
formfield_callback=formfield_callback,
View
@@ -636,7 +636,7 @@ def __init__(self, *args, **kwargs):
class RadioInput(RadioChoiceInput):
def __init__(self, *args, **kwargs):
msg = "RadioInput has been deprecated. Use RadioChoiceInput instead."
- warnings.warn(msg, PendingDeprecationWarning, stacklevel=2)
+ warnings.warn(msg, DeprecationWarning, stacklevel=2)
super(RadioInput, self).__init__(*args, **kwargs)
@@ -199,7 +199,7 @@ def __init__(self, cache_timeout=None, cache_anonymous_only=None, **kwargs):
if self.cache_anonymous_only:
msg = "CACHE_MIDDLEWARE_ANONYMOUS_ONLY has been deprecated and will be removed in Django 1.8."
- warnings.warn(msg, PendingDeprecationWarning, stacklevel=1)
+ warnings.warn(msg, DeprecationWarning, stacklevel=1)
self.cache = get_cache(self.cache_alias, **cache_kwargs)
self.cache_timeout = self.cache.default_timeout
@@ -110,7 +110,7 @@ def process_response(self, request, response):
if settings.SEND_BROKEN_LINK_EMAILS:
warnings.warn("SEND_BROKEN_LINK_EMAILS is deprecated. "
"Use BrokenLinkEmailsMiddleware instead.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
BrokenLinkEmailsMiddleware().process_response(request, response)
if settings.USE_ETAGS:
View
@@ -1,6 +1,6 @@
"""XViewMiddleware has been moved to django.contrib.admindocs.middleware."""
import warnings
-warnings.warn(__doc__, PendingDeprecationWarning, stacklevel=2)
+warnings.warn(__doc__, DeprecationWarning, stacklevel=2)
from django.contrib.admindocs.middleware import XViewMiddleware
@@ -14,7 +14,7 @@ class TransactionMiddleware(object):
def __init__(self):
warnings.warn(
"TransactionMiddleware is deprecated in favor of ATOMIC_REQUESTS.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
if connection.settings_dict['ATOMIC_REQUESTS']:
raise MiddlewareNotUsed
@@ -568,7 +568,7 @@ def cycle(parser, token, escape=False):
"'The `cycle` template tag is changing to escape its arguments; "
"the non-autoescaping version is deprecated. Load it "
"from the `future` tag library to start using the new behavior.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
# Note: This returns the exact same node on each {% cycle name %} call;
# that is, the node object returned from {% cycle a b c as name %} and the
@@ -712,7 +712,7 @@ def firstof(parser, token, escape=False):
"'The `firstof` template tag is changing to escape its arguments; "
"the non-autoescaping version is deprecated. Load it "
"from the `future` tag library to start using the new behavior.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
bits = token.split_contents()[1:]
if len(bits) < 1:
View
@@ -54,7 +54,7 @@ def _test():
warnings.warn(
"The django.test._doctest module is deprecated; "
"use the doctest module from the Python standard library instead.",
- PendingDeprecationWarning)
+ DeprecationWarning)
__docformat__ = 'reStructuredText en'
View
@@ -21,7 +21,7 @@
warnings.warn(
"The django.test.simple module and DjangoTestSuiteRunner are deprecated; "
"use django.test.runner.DiscoverRunner instead.",
- PendingDeprecationWarning)
+ DeprecationWarning)
# The module name for tests outside models.py
TEST_MODULE = 'tests'
View
@@ -139,7 +139,7 @@ def _detect_image_library():
warnings.warn(
"Support for the PIL will be removed in Django 1.8. Please " +
"uninstall it & install Pillow instead.",
- PendingDeprecationWarning
+ DeprecationWarning
)
return PILImage, PIL_imaging, PILImageFile
View
@@ -83,6 +83,6 @@ def shortcut(request, content_type_id, object_id):
warnings.warn(
"django.views.defaults.shortcut will be removed in Django 1.8. "
"Import it from django.contrib.contenttypes.views instead.",
- PendingDeprecationWarning, stacklevel=2)
+ DeprecationWarning, stacklevel=2)
from django.contrib.contenttypes.views import shortcut as real_shortcut
return real_shortcut(request, content_type_id, object_id)
@@ -113,7 +113,7 @@ def get_form_class(self):
if self.fields is None:
warnings.warn("Using ModelFormMixin (base class of %s) without "
"the 'fields' attribute is deprecated." % self.__class__.__name__,
- PendingDeprecationWarning)
+ DeprecationWarning)
return model_forms.modelform_factory(model, fields=self.fields)
@@ -1,8 +1,8 @@
from django.db import models
-from django.contrib.comments.models import Comment
+from django.contrib.auth.models import User
# Regression for #13368. This is an example of a model
# that imports a class that has an abstract base class.
-class CommentScore(models.Model):
- comment = models.OneToOneField(Comment, primary_key=True)
+class UserProfile(models.Model):
+ user = models.OneToOneField(User, primary_key=True)
@@ -1079,7 +1079,6 @@ def test_app_with_import(self):
"manage.py validate does not raise errors when an app imports a base class that itself has an abstract base"
self.write_settings('settings.py',
apps=['admin_scripts.app_with_import',
- 'django.contrib.comments',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sites'],
Oops, something went wrong.

0 comments on commit acd7b34

Please sign in to comment.