summaryrefslogtreecommitdiff
path: root/django/conf
diff options
context:
space:
mode:
Diffstat (limited to 'django/conf')
-rw-r--r--django/conf/__init__.py2
-rw-r--r--django/conf/urls/defaults.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index 6a2485bd4b..531eed8658 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -181,7 +181,7 @@ def compat_patch_logging_config(logging_config):
"handler: adding implicit debug-false-only filter. "
"See http://docs.djangoproject.com/en/dev/releases/1.4/"
"#request-exceptions-are-now-always-logged",
- PendingDeprecationWarning)
+ DeprecationWarning)
filter_name = "require_debug_false"
diff --git a/django/conf/urls/defaults.py b/django/conf/urls/defaults.py
index 326f05f4ba..7d5c738bad 100644
--- a/django/conf/urls/defaults.py
+++ b/django/conf/urls/defaults.py
@@ -1,6 +1,6 @@
import warnings
warnings.warn("django.conf.urls.defaults is deprecated; use django.conf.urls instead",
- PendingDeprecationWarning)
+ DeprecationWarning)
from django.conf.urls import (handler403, handler404, handler500,
include, patterns, url)