diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-12-24 22:36:44 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-12-29 21:58:12 +0100 |
| commit | 59ddb79e9090f8609f9125379db08adc95d507c0 (patch) | |
| tree | 5d9604a6790d664410efa5b9c7922df99fbd689a | |
| parent | fb9f1b9bfb7378027adfe916733c701a89f8bb24 (diff) | |
Removed django.conf.urls.defaults.
| -rw-r--r-- | django/conf/urls/defaults.py | 6 | ||||
| -rw-r--r-- | docs/ref/urls.txt | 8 |
2 files changed, 0 insertions, 14 deletions
diff --git a/django/conf/urls/defaults.py b/django/conf/urls/defaults.py deleted file mode 100644 index 7d5c738bad..0000000000 --- a/django/conf/urls/defaults.py +++ /dev/null @@ -1,6 +0,0 @@ -import warnings -warnings.warn("django.conf.urls.defaults is deprecated; use django.conf.urls instead", - DeprecationWarning) - -from django.conf.urls import (handler403, handler404, handler500, - include, patterns, url) diff --git a/docs/ref/urls.txt b/docs/ref/urls.txt index b9a0199984..46332cb42c 100644 --- a/docs/ref/urls.txt +++ b/docs/ref/urls.txt @@ -4,14 +4,6 @@ .. module:: django.conf.urls -.. versionchanged:: 1.4 - Starting with Django 1.4 functions ``patterns``, ``url``, ``include`` plus - the ``handler*`` symbols described below live in the ``django.conf.urls`` - module. - - Until Django 1.3 they were located in ``django.conf.urls.defaults``. You - still can import them from there but it will be removed in Django 1.6. - patterns() ---------- |