diff options
| author | Tim Graham <timograham@gmail.com> | 2015-09-05 12:22:35 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-23 19:31:11 -0400 |
| commit | 48e7787db599b0103daf70f0ff4968d90b8540aa (patch) | |
| tree | 4ea92c1b4a6b42adaccb54790adb8ef6886fa381 | |
| parent | 2ccfac1a651ff35cd243cd272b2202ae1ccd5740 (diff) | |
Removed RemovedInDjango110Warning.
| -rw-r--r-- | django/utils/deprecation.py | 6 | ||||
| -rwxr-xr-x | tests/runtests.py | 5 | ||||
| -rw-r--r-- | tests/test_runner/tests.py | 5 |
3 files changed, 5 insertions, 11 deletions
diff --git a/django/utils/deprecation.py b/django/utils/deprecation.py index df2f701b71..33c384d1f8 100644 --- a/django/utils/deprecation.py +++ b/django/utils/deprecation.py @@ -8,11 +8,7 @@ class RemovedInDjango20Warning(PendingDeprecationWarning): pass -class RemovedInDjango110Warning(DeprecationWarning): - pass - - -RemovedInNextVersionWarning = RemovedInDjango110Warning +RemovedInNextVersionWarning = DeprecationWarning class warn_about_renamed_method(object): diff --git a/tests/runtests.py b/tests/runtests.py index 0726fbb51d..955f96df7f 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -19,12 +19,9 @@ from django.test.runner import default_test_processes from django.test.utils import get_runner from django.utils import six from django.utils._os import upath -from django.utils.deprecation import ( - RemovedInDjango20Warning, RemovedInDjango110Warning, -) +from django.utils.deprecation import RemovedInDjango20Warning from django.utils.log import DEFAULT_LOGGING -warnings.simplefilter("error", RemovedInDjango110Warning) warnings.simplefilter("error", RemovedInDjango20Warning) RUNTESTS_DIR = os.path.abspath(os.path.dirname(upath(__file__))) diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py index bf0b8795cc..b363514b2c 100644 --- a/tests/test_runner/tests.py +++ b/tests/test_runner/tests.py @@ -352,8 +352,9 @@ class DeprecationDisplayTest(AdminScriptTestCase): args = ['test', '--settings=test_project.settings', 'test_runner_deprecation_app'] out, err = self.run_django_admin(args) self.assertIn("Ran 1 test", force_text(err)) - six.assertRegex(self, err, r"RemovedInDjango\d+Warning: warning from test") - six.assertRegex(self, err, r"RemovedInDjango\d+Warning: module-level warning from deprecation_app") + # change "Deprecation" to "RemovedInDjango\d+" in Django 1.11. + six.assertRegex(self, err, r"DeprecationWarning: warning from test") + six.assertRegex(self, err, r"DeprecationWarning: module-level warning from deprecation_app") def test_runner_deprecation_verbosity_zero(self): args = ['test', '--settings=test_project.settings', '--verbosity=0', 'test_runner_deprecation_app'] |