From d0f9f3b2fb8c3c962ff4f0d650c879fd0fff2ecb Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Sun, 11 Sep 2011 22:36:16 +0000 Subject: [PATCH] Fixed #14675 -- Completed removal of `from django.conf.urls.default import *` usage. This applies to both our own [test] code and documentation examples. Also: * Moved the functions and handlers from `django.conf.urls.defaults` up to `django.conf.urls` deprecating the former module. * Added documentation for `handler403`. * Tweaked the URLs topic document a bit. Thanks to pupeno and cdestigter for their great work contributing patches. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- formtools/tests/urls.py | 2 +- formtools/tests/wizard/namedwizardtests/urls.py | 2 +- formtools/tests/wizard/wizardtests/urls.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/formtools/tests/urls.py b/formtools/tests/urls.py index f058335..313a534 100644 --- a/formtools/tests/urls.py +++ b/formtools/tests/urls.py @@ -2,7 +2,7 @@ This is a URLconf to be loaded by tests.py. Add any URLs needed for tests only. """ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from django.contrib.formtools.tests import TestFormPreview, TestWizardClass from forms import (ContactWizard, Page1, Page2, Page3, TestForm, diff --git a/formtools/tests/wizard/namedwizardtests/urls.py b/formtools/tests/wizard/namedwizardtests/urls.py index 04019d1..ac2cadc 100644 --- a/formtools/tests/wizard/namedwizardtests/urls.py +++ b/formtools/tests/wizard/namedwizardtests/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from django.contrib.formtools.tests.wizard.namedwizardtests.forms import ( SessionContactWizard, CookieContactWizard, Page1, Page2, Page3, Page4) diff --git a/formtools/tests/wizard/wizardtests/urls.py b/formtools/tests/wizard/wizardtests/urls.py index e6d18ea..dabce53 100644 --- a/formtools/tests/wizard/wizardtests/urls.py +++ b/formtools/tests/wizard/wizardtests/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from django.contrib.formtools.tests.wizard.wizardtests.forms import ( SessionContactWizard, CookieContactWizard, Page1, Page2, Page3, Page4)