Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Advanced deprecation warnings for Django 1.7.

  • Loading branch information...
commit acd7b34aafe352ef604edcb73f75041c5cbba6b9 1 parent 8b9b8d3
@aaugustin aaugustin authored
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
View
2  django/conf/urls/shortcut.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'),
View
2  django/contrib/admin/options.py
@@ -76,7 +76,7 @@ class IncorrectLookupParameters(Exception):
class RenameBaseModelAdminMethods(forms.MediaDefiningClass, RenameMethodsBase):
renamed_methods = (
- ('queryset', 'get_queryset', PendingDeprecationWarning),
+ ('queryset', 'get_queryset', DeprecationWarning),
)
View
8 django/contrib/admin/views/main.py
@@ -52,7 +52,7 @@ 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
@@ -60,7 +60,7 @@ def _is_changelist_popup(request):
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):
View
2  django/contrib/comments/__init__.py
@@ -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'
View
2  django/contrib/comments/templatetags/comments.py
@@ -12,7 +12,7 @@
class RenameBaseCommentNodeMethods(RenameMethodsBase):
renamed_methods = (
- ('get_query_set', 'get_queryset', PendingDeprecationWarning),
+ ('get_query_set', 'get_queryset', DeprecationWarning),
)
View
2  django/contrib/contenttypes/generic.py
@@ -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
4 django/db/__init__.py
@@ -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:
View
2  django/db/backends/creation.py
@@ -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):
View
4 django/db/models/fields/related.py
@@ -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),
)
View
4 django/db/models/manager.py
@@ -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),
)
View
8 django/db/models/options.py
@@ -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
14 django/db/transaction.py
@@ -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
2  django/db/utils.py
@@ -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
2  django/forms/forms.py
@@ -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
6 django/forms/models.py
@@ -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
2  django/forms/widgets.py
@@ -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)
View
2  django/middleware/cache.py
@@ -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
View
2  django/middleware/common.py
@@ -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
2  django/middleware/doc.py
@@ -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
View
2  django/middleware/transaction.py
@@ -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
View
4 django/template/defaulttags.py
@@ -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
2  django/test/_doctest.py
@@ -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
2  django/test/simple.py
@@ -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
2  django/utils/image.py
@@ -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
2  django/views/defaults.py
@@ -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)
View
2  django/views/generic/edit.py
@@ -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)
View
6 tests/admin_scripts/app_with_import/models.py
@@ -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)
View
1  tests/admin_scripts/tests.py
@@ -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'],
View
4 tests/cache/tests.py
@@ -28,7 +28,7 @@
from django.template import Template
from django.template.response import TemplateResponse
from django.test import TestCase, TransactionTestCase, RequestFactory
-from django.test.utils import override_settings, IgnorePendingDeprecationWarningsMixin
+from django.test.utils import override_settings, IgnoreDeprecationWarningsMixin
from django.utils import six, timezone, translation, unittest
from django.utils.cache import (patch_vary_headers, get_cache_key,
learn_cache_key, patch_cache_control, patch_response_headers)
@@ -1594,7 +1594,7 @@ def hello_world_view(request, value):
},
},
)
-class CacheMiddlewareTest(IgnorePendingDeprecationWarningsMixin, TestCase):
+class CacheMiddlewareTest(IgnoreDeprecationWarningsMixin, TestCase):
def setUp(self):
super(CacheMiddlewareTest, self).setUp()
View
2  tests/deprecation/tests.py
@@ -8,7 +8,7 @@
class RenameManagerMethods(RenameMethodsBase):
renamed_methods = (
- ('old', 'new', PendingDeprecationWarning),
+ ('old', 'new', DeprecationWarning),
)
View
6 tests/generic_views/test_edit.py
@@ -146,7 +146,7 @@ class MyCreateView(CreateView):
def test_create_view_all_fields(self):
with warnings.catch_warnings(record=True) as w:
- warnings.simplefilter("always", PendingDeprecationWarning)
+ warnings.simplefilter("always", DeprecationWarning)
class MyCreateView(CreateView):
model = Author
@@ -160,7 +160,7 @@ class MyCreateView(CreateView):
def test_create_view_without_explicit_fields(self):
with warnings.catch_warnings(record=True) as w:
- warnings.simplefilter("always", PendingDeprecationWarning)
+ warnings.simplefilter("always", DeprecationWarning)
class MyCreateView(CreateView):
model = Author
@@ -171,7 +171,7 @@ class MyCreateView(CreateView):
['name', 'slug'])
# but with a warning:
- self.assertEqual(w[0].category, PendingDeprecationWarning)
+ self.assertEqual(w[0].category, DeprecationWarning)
class UpdateViewTests(TestCase):
View
10 tests/middleware/tests.py
@@ -18,7 +18,7 @@
from django.middleware.gzip import GZipMiddleware
from django.middleware.transaction import TransactionMiddleware
from django.test import TransactionTestCase, TestCase, RequestFactory
-from django.test.utils import override_settings, IgnorePendingDeprecationWarningsMixin
+from django.test.utils import override_settings, IgnoreDeprecationWarningsMixin
from django.utils import six
from django.utils.encoding import force_str
from django.utils.six.moves import xrange
@@ -249,7 +249,7 @@ def test_404_error_reporting(self):
request = self._get_request('regular_url/that/does/not/exist')
request.META['HTTP_REFERER'] = '/another/url/'
with warnings.catch_warnings():
- warnings.simplefilter("ignore", PendingDeprecationWarning)
+ warnings.simplefilter("ignore", DeprecationWarning)
response = self.client.get(request.path)
CommonMiddleware().process_response(request, response)
self.assertEqual(len(mail.outbox), 1)
@@ -261,7 +261,7 @@ def test_404_error_reporting(self):
def test_404_error_reporting_no_referer(self):
request = self._get_request('regular_url/that/does/not/exist')
with warnings.catch_warnings():
- warnings.simplefilter("ignore", PendingDeprecationWarning)
+ warnings.simplefilter("ignore", DeprecationWarning)
response = self.client.get(request.path)
CommonMiddleware().process_response(request, response)
self.assertEqual(len(mail.outbox), 0)
@@ -273,7 +273,7 @@ def test_404_error_reporting_ignored_url(self):
request = self._get_request('foo_url/that/does/not/exist/either')
request.META['HTTP_REFERER'] = '/another/url/'
with warnings.catch_warnings():
- warnings.simplefilter("ignore", PendingDeprecationWarning)
+ warnings.simplefilter("ignore", DeprecationWarning)
response = self.client.get(request.path)
CommonMiddleware().process_response(request, response)
self.assertEqual(len(mail.outbox), 0)
@@ -703,7 +703,7 @@ def test_compress_response(self):
self.assertNotEqual(gzip_etag, nogzip_etag)
-class TransactionMiddlewareTest(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TransactionMiddlewareTest(IgnoreDeprecationWarningsMixin, TransactionTestCase):
"""
Test the transaction middleware.
"""
View
4 tests/model_forms/tests.py
@@ -266,7 +266,7 @@ def test_base_form(self):
def test_missing_fields_attribute(self):
with warnings.catch_warnings(record=True) as w:
- warnings.simplefilter("always", PendingDeprecationWarning)
+ warnings.simplefilter("always", DeprecationWarning)
class MissingFieldsForm(forms.ModelForm):
class Meta:
@@ -276,7 +276,7 @@ class Meta:
# if a warning has been seen already, the catch_warnings won't
# have recorded it. The following line therefore will not work reliably:
- # self.assertEqual(w[0].category, PendingDeprecationWarning)
+ # self.assertEqual(w[0].category, DeprecationWarning)
# Until end of the deprecation cycle, should still create the
# form as before:
View
4 tests/model_forms_regress/tests.py
@@ -566,10 +566,10 @@ def test_modelform_factory_metaclass(self):
class TestTicket19733(TestCase):
def test_modelform_factory_without_fields(self):
with warnings.catch_warnings(record=True) as w:
- warnings.simplefilter("always", PendingDeprecationWarning)
+ warnings.simplefilter("always", DeprecationWarning)
# This should become an error once deprecation cycle is complete.
form = modelform_factory(Person)
- self.assertEqual(w[0].category, PendingDeprecationWarning)
+ self.assertEqual(w[0].category, DeprecationWarning)
def test_modelform_factory_with_all_fields(self):
form = modelform_factory(Person, fields="__all__")
View
2  tests/runtests.py
@@ -109,7 +109,7 @@ def no_available_apps(self):
# Load all the ALWAYS_INSTALLED_APPS.
with warnings.catch_warnings():
- warnings.filterwarnings('ignore', 'django.contrib.comments is deprecated and will be removed before Django 1.8.', PendingDeprecationWarning)
+ warnings.filterwarnings('ignore', 'django.contrib.comments is deprecated and will be removed before Django 1.8.', DeprecationWarning)
get_apps()
# Load all the test model apps.
View
2  tests/template_tests/tests.py
@@ -534,7 +534,7 @@ def test_templates(self):
try:
with warnings.catch_warnings():
# Ignore pending deprecations of the old syntax of the 'cycle' and 'firstof' tags.
- warnings.filterwarnings("ignore", category=PendingDeprecationWarning, module='django.template.base')
+ warnings.filterwarnings("ignore", category=DeprecationWarning, module='django.template.base')
test_template = loader.get_template(name)
except ShouldNotExecuteException:
failures.append("Template test (Cached='%s', TEMPLATE_STRING_IF_INVALID='%s', TEMPLATE_DEBUG=%s): %s -- FAILED. Template loading invoked method that shouldn't have been invoked." % (is_cached, invalid_str, template_debug, name))
View
4 tests/test_runner/tests.py
@@ -11,7 +11,7 @@
from django import db
from django.test import runner, TestCase, TransactionTestCase, skipUnlessDBFeature
from django.test.testcases import connections_support_transactions
-from django.test.utils import IgnorePendingDeprecationWarningsMixin
+from django.test.utils import IgnoreDeprecationWarningsMixin
from django.utils import unittest
from django.utils.importlib import import_module
@@ -225,7 +225,7 @@ def test_ticket_17477(self):
self.assertNoOutput(err)
-class ModulesTestsPackages(IgnorePendingDeprecationWarningsMixin, unittest.TestCase):
+class ModulesTestsPackages(IgnoreDeprecationWarningsMixin, unittest.TestCase):
def test_get_tests(self):
"Check that the get_tests helper function can find tests in a directory"
from django.test.simple import get_tests
View
4 tests/test_suite_override/tests.py
@@ -1,5 +1,5 @@
from django.db.models import get_app
-from django.test.utils import IgnorePendingDeprecationWarningsMixin
+from django.test.utils import IgnoreDeprecationWarningsMixin
from django.utils import unittest
@@ -9,7 +9,7 @@ def suite():
return testSuite
-class SuiteOverrideTest(IgnorePendingDeprecationWarningsMixin, unittest.TestCase):
+class SuiteOverrideTest(IgnoreDeprecationWarningsMixin, unittest.TestCase):
def test_suite_override(self):
"""
Validate that you can define a custom suite when running tests with
View
4 tests/test_utils/tests.py
@@ -7,7 +7,7 @@
from django.template.loader import render_to_string
from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
from django.test.html import HTMLParseError, parse_html
-from django.test.utils import CaptureQueriesContext, IgnorePendingDeprecationWarningsMixin
+from django.test.utils import CaptureQueriesContext, IgnoreDeprecationWarningsMixin
from django.utils import six
from django.utils import unittest
from django.utils.unittest import skip
@@ -591,7 +591,7 @@ class MyCustomField(IntegerField):
self.assertFieldOutput(MyCustomField, {}, {}, empty_value=None)
-class DoctestNormalizerTest(IgnorePendingDeprecationWarningsMixin, SimpleTestCase):
+class DoctestNormalizerTest(IgnoreDeprecationWarningsMixin, SimpleTestCase):
def test_normalizer(self):
from django.test.simple import make_doctest
View
8 tests/transactions/tests.py
@@ -4,7 +4,7 @@
from django.db import connection, transaction, DatabaseError, IntegrityError
from django.test import TransactionTestCase, skipUnlessDBFeature
-from django.test.utils import IgnorePendingDeprecationWarningsMixin
+from django.test.utils import IgnoreDeprecationWarningsMixin
from django.utils import six
from django.utils.unittest import skipIf, skipUnless
@@ -350,7 +350,7 @@ def __call__(self):
transaction.atomic(Callable())
-class TransactionTests(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TransactionTests(IgnoreDeprecationWarningsMixin, TransactionTestCase):
available_apps = ['transactions']
@@ -508,7 +508,7 @@ def test_manually_managed_with_using(self):
)
-class TransactionRollbackTests(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TransactionRollbackTests(IgnoreDeprecationWarningsMixin, TransactionTestCase):
available_apps = ['transactions']
@@ -528,7 +528,7 @@ def test_bad_sql(self):
self.assertRaises(IntegrityError, execute_bad_sql)
transaction.rollback()
-class TransactionContextManagerTests(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TransactionContextManagerTests(IgnoreDeprecationWarningsMixin, TransactionTestCase):
available_apps = ['transactions']
View
12 tests/transactions_regress/tests.py
@@ -4,7 +4,7 @@
IntegrityError)
from django.db.transaction import commit_on_success, commit_manually, TransactionManagementError
from django.test import TransactionTestCase, skipUnlessDBFeature
-from django.test.utils import override_settings, IgnorePendingDeprecationWarningsMixin
+from django.test.utils import override_settings, IgnoreDeprecationWarningsMixin
from django.utils.unittest import skipIf, skipUnless
from .models import Mod, M2mA, M2mB, SubMod
@@ -30,7 +30,7 @@ def test_save(self):
self.assertEqual(SubMod.objects.count(), 1)
self.assertEqual(Mod.objects.count(), 1)
-class TestTransactionClosing(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TestTransactionClosing(IgnoreDeprecationWarningsMixin, TransactionTestCase):
"""
Tests to make sure that transactions are properly closed
when they should be, and aren't left pending after operations
@@ -194,7 +194,7 @@ def test_failing_query_transaction_closed_debug(self):
(connection.settings_dict['NAME'] == ':memory:' or
not connection.settings_dict['NAME']),
'Test uses multiple connections, but in-memory sqlite does not support this')
-class TestNewConnection(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TestNewConnection(IgnoreDeprecationWarningsMixin, TransactionTestCase):
"""
Check that new connections don't have special behaviour.
"""
@@ -242,7 +242,7 @@ def test_enter_exit_management(self):
@skipUnless(connection.vendor == 'postgresql',
"This test only valid for PostgreSQL")
-class TestPostgresAutocommitAndIsolation(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TestPostgresAutocommitAndIsolation(IgnoreDeprecationWarningsMixin, TransactionTestCase):
"""
Tests to make sure psycopg2's autocommit mode and isolation level
is restored after entering and leaving transaction management.
@@ -326,7 +326,7 @@ def test_enter_autocommit(self):
self.assertTrue(connection.autocommit)
-class TestManyToManyAddTransaction(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TestManyToManyAddTransaction(IgnoreDeprecationWarningsMixin, TransactionTestCase):
available_apps = ['transactions_regress']
@@ -344,7 +344,7 @@ def test_manyrelated_add_commit(self):
self.assertEqual(a.others.count(), 1)
-class SavepointTest(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class SavepointTest(IgnoreDeprecationWarningsMixin, TransactionTestCase):
available_apps = ['transactions_regress']
Please sign in to comment.
Something went wrong with that request. Please try again.