mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 15:16:09 +00:00
Code Issues 32 Releases Wiki Activity

[1.8.x] Renamed RemovedInDjango20Warning to RemovedInDjango110Warning.

Browse Source
This commit is contained in:
Tim Graham
2015-06-22 13:54:35 -04:00
parent 7439039806
commit ae1d663b79
103 changed files with 348 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/runtests.py
View File

@@ -17,11 +17,11 @@ from django.test.utils import get_runner
from django.utils import six
from django.utils._os import upath
from django.utils.deprecation import (
RemovedInDjango19Warning, RemovedInDjango20Warning,
RemovedInDjango19Warning, RemovedInDjango110Warning,
)
warnings.simplefilter("error", RemovedInDjango19Warning)
warnings.simplefilter("error", RemovedInDjango20Warning)
warnings.simplefilter("error", RemovedInDjango110Warning)
RUNTESTS_DIR = os.path.abspath(os.path.dirname(upath(__file__)))
@@ -111,7 +111,7 @@ def setup(verbosity, test_labels):
state = {
'INSTALLED_APPS': settings.INSTALLED_APPS,
'ROOT_URLCONF': getattr(settings, "ROOT_URLCONF", ""),
# Remove the following line in Django 2.0.
# Remove the following line in Django 1.10.
'TEMPLATE_DIRS': settings.TEMPLATE_DIRS,
'TEMPLATES': settings.TEMPLATES,
'LANGUAGE_CODE': settings.LANGUAGE_CODE,
@@ -125,7 +125,7 @@ def setup(verbosity, test_labels):
settings.ROOT_URLCONF = 'urls'
settings.STATIC_URL = '/static/'
settings.STATIC_ROOT = os.path.join(TMPDIR, 'static')
# Remove the following line in Django 2.0.
# Remove the following line in Django 1.10.
settings.TEMPLATE_DIRS = (TEMPLATE_DIR,)
settings.TEMPLATES = [{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -162,8 +162,8 @@ def setup(verbosity, test_labels):
warnings.filterwarnings(
'ignore',
'django.contrib.webdesign will be removed in Django 2.0.',
RemovedInDjango20Warning
'django.contrib.webdesign will be removed in Django 1.10.',
RemovedInDjango110Warning
)
# Load all the ALWAYS_INSTALLED_APPS.