mirror of
https://github.com/django/django.git
synced 2025-08-04 02:48:35 +00:00
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
This commit is contained in:
parent
fd90453462
commit
26b8122087
88 changed files with 243 additions and 198 deletions
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls.defaults import patterns, url
|
||||
from django.conf.urls import patterns, url
|
||||
|
||||
urlpatterns = patterns('',
|
||||
# View has erroneous import
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
Some extra URL patterns that are included at the top level.
|
||||
"""
|
||||
|
||||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url, include
|
||||
from views import empty_view
|
||||
|
||||
urlpatterns = patterns('',
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url, include
|
||||
from views import empty_view
|
||||
|
||||
urlpatterns = patterns('',
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url
|
||||
from views import empty_view
|
||||
|
||||
urlpatterns = patterns('',
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url, include
|
||||
from namespace_urls import URLObject
|
||||
from views import view_class_instance
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url
|
||||
from views import empty_view
|
||||
|
||||
urlpatterns = patterns('',
|
||||
|
|
|
@ -5,7 +5,7 @@ each name to resolve and Django must distinguish the possibilities based on the
|
|||
argument list.
|
||||
"""
|
||||
|
||||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url
|
||||
from views import empty_view
|
||||
|
||||
urlpatterns = patterns('',
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url, include
|
||||
from views import empty_view
|
||||
|
||||
urlpatterns = patterns('',
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url, include
|
||||
from views import view_class_instance
|
||||
|
||||
class URLObject(object):
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
#from django.conf.urls.defaults import *
|
||||
#from django.conf.urls import patterns, url, include
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url
|
||||
|
||||
from views import empty_view, LazyRedirectView, login_required_view
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url
|
||||
from django.template import Template, Context
|
||||
from django.http import HttpResponse
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url, include
|
||||
|
||||
import urlconf_inner
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls.defaults import *
|
||||
from django.conf.urls import patterns, url, include
|
||||
from views import empty_view, absolute_kwargs_view
|
||||
|
||||
other_patterns = patterns('',
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Used by the ErrorHandlerResolutionTests test case.
|
||||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from django.conf.urls import patterns
|
||||
|
||||
urlpatterns = patterns('')
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Used by the ErrorHandlerResolutionTests test case.
|
||||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from django.conf.urls import patterns
|
||||
from views import empty_view
|
||||
|
||||
urlpatterns = patterns('')
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# A URLs file that doesn't use the default
|
||||
# from django.conf.urls.defaults import *
|
||||
# from django.conf.urls import *
|
||||
# import pattern.
|
||||
from django.conf.urls.defaults import patterns, url
|
||||
from django.conf.urls import patterns, url
|
||||
from views import empty_view, bad_view
|
||||
|
||||
urlpatterns = patterns('',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue