p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed RemovedInDjango110Warning.

This commit is contained in:
Tim Graham 2015-09-05 12:22:35 -04:00
parent 2ccfac1a65
commit 48e7787db5
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/utils/deprecation.py
View File

@ -8,11 +8,7 @@ class RemovedInDjango20Warning(PendingDeprecationWarning):
pass pass
class RemovedInDjango110Warning(DeprecationWarning): RemovedInNextVersionWarning = DeprecationWarning
pass
RemovedInNextVersionWarning = RemovedInDjango110Warning
class warn_about_renamed_method(object): class warn_about_renamed_method(object):

5
tests/runtests.py
View File

@ -19,12 +19,9 @@ from django.test.runner import default_test_processes
from django.test.utils import get_runner from django.test.utils import get_runner
from django.utils import six from django.utils import six
from django.utils._os import upath from django.utils._os import upath
from django.utils.deprecation import ( from django.utils.deprecation import RemovedInDjango20Warning
RemovedInDjango20Warning, RemovedInDjango110Warning,
)
from django.utils.log import DEFAULT_LOGGING from django.utils.log import DEFAULT_LOGGING
warnings.simplefilter("error", RemovedInDjango110Warning)
warnings.simplefilter("error", RemovedInDjango20Warning) warnings.simplefilter("error", RemovedInDjango20Warning)
RUNTESTS_DIR = os.path.abspath(os.path.dirname(upath(__file__))) RUNTESTS_DIR = os.path.abspath(os.path.dirname(upath(__file__)))

5
tests/test_runner/tests.py
View File

@ -352,8 +352,9 @@ class DeprecationDisplayTest(AdminScriptTestCase):
args = ['test', '--settings=test_project.settings', 'test_runner_deprecation_app'] args = ['test', '--settings=test_project.settings', 'test_runner_deprecation_app']
out, err = self.run_django_admin(args) out, err = self.run_django_admin(args)
self.assertIn("Ran 1 test", force_text(err)) self.assertIn("Ran 1 test", force_text(err))
six.assertRegex(self, err, r"RemovedInDjango\d+Warning: warning from test") # change "Deprecation" to "RemovedInDjango\d+" in Django 1.11.
six.assertRegex(self, err, r"RemovedInDjango\d+Warning: module-level warning from deprecation_app") 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): def test_runner_deprecation_verbosity_zero(self):
args = ['test', '--settings=test_project.settings', '--verbosity=0', 'test_runner_deprecation_app'] args = ['test', '--settings=test_project.settings', '--verbosity=0', 'test_runner_deprecation_app']