summaryrefslogtreecommitdiff
path: root/django/conf/__init__.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-06-22 13:54:35 -0400
committerTim Graham <timograham@gmail.com>2015-06-24 16:08:20 -0400
commitaaacaeb0963c406c4fe6f68c6ae51f4a65878250 (patch)
treeb100c6ffc345f12342243a8ac684a692b26a9357 /django/conf/__init__.py
parente73842a95fb751f89a8cafc861bfd57d034cd116 (diff)
Renamed RemovedInDjangoXYWarnings for new roadmap.
Forwardport of ae1d663b7913f6da233c55409c4973248372d302 from stable/1.8.x plus more.
Diffstat (limited to 'django/conf/__init__.py')
-rw-r--r--django/conf/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index 63d32be9c9..bbc0fb92cd 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -13,7 +13,7 @@ import warnings
from django.conf import global_settings
from django.core.exceptions import ImproperlyConfigured
-from django.utils.deprecation import RemovedInDjango20Warning
+from django.utils.deprecation import RemovedInDjango110Warning
from django.utils.functional import LazyObject, empty
ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@@ -114,11 +114,11 @@ class Settings(BaseSettings):
if ('django.contrib.auth.middleware.AuthenticationMiddleware' in self.MIDDLEWARE_CLASSES and
'django.contrib.auth.middleware.SessionAuthenticationMiddleware' not in self.MIDDLEWARE_CLASSES):
warnings.warn(
- "Session verification will become mandatory in Django 2.0. "
+ "Session verification will become mandatory in Django 1.10. "
"Please add 'django.contrib.auth.middleware.SessionAuthenticationMiddleware' "
"to your MIDDLEWARE_CLASSES setting when you are ready to opt-in after "
"reading the upgrade considerations in the 1.8 release notes.",
- RemovedInDjango20Warning
+ RemovedInDjango110Warning
)
if hasattr(time, 'tzset') and self.TIME_ZONE: