Code

Ticket #14675: contrib-apps.diff

File contrib-apps.diff, 4.6 KB (added by pupeno, 4 years ago)

Explicitly included functions from urls.default in contrib apps.

Line 
1diff --git a/django/contrib/admindocs/urls.py b/django/contrib/admindocs/urls.py
2index 57edb56..2e9600f 100644
3--- a/django/contrib/admindocs/urls.py
4+++ b/django/contrib/admindocs/urls.py
5@@ -1,4 +1,4 @@
6-from django.conf.urls.defaults import *
7+from django.conf.urls.defaults import patterns, url
8 from django.contrib.admindocs import views
9 
10 urlpatterns = patterns('',
11diff --git a/django/contrib/auth/urls.py b/django/contrib/auth/urls.py
12index 4f8a102..c7b2d56 100644
13--- a/django/contrib/auth/urls.py
14+++ b/django/contrib/auth/urls.py
15@@ -2,7 +2,7 @@
16 # provided as a convenience to those who want to deploy these URLs elsewhere.
17 # This file is also used to provide a reliable view deployment for test purposes.
18 
19-from django.conf.urls.defaults import *
20+from django.conf.urls.defaults import patterns
21 
22 urlpatterns = patterns('',
23     (r'^login/$', 'django.contrib.auth.views.login'),
24diff --git a/django/contrib/comments/urls.py b/django/contrib/comments/urls.py
25index d903779..d3c06e5 100644
26--- a/django/contrib/comments/urls.py
27+++ b/django/contrib/comments/urls.py
28@@ -1,4 +1,4 @@
29-from django.conf.urls.defaults import *
30+from django.conf.urls.defaults import patterns, url
31 
32 urlpatterns = patterns('django.contrib.comments.views',
33     url(r'^post/$',          'comments.post_comment',       name='comments-post-comment'),
34diff --git a/django/contrib/databrowse/urls.py b/django/contrib/databrowse/urls.py
35index 9b85d14..2559686 100644
36--- a/django/contrib/databrowse/urls.py
37+++ b/django/contrib/databrowse/urls.py
38@@ -1,4 +1,4 @@
39-from django.conf.urls.defaults import *
40+from django.conf.urls.defaults import patterns
41 from django.contrib.databrowse import views
42 
43 # Note: The views in this URLconf all require a 'models' argument,
44diff --git a/django/contrib/flatpages/tests/urls.py b/django/contrib/flatpages/tests/urls.py
45index 3cffd09..20cbc37 100644
46--- a/django/contrib/flatpages/tests/urls.py
47+++ b/django/contrib/flatpages/tests/urls.py
48@@ -1,4 +1,4 @@
49-from django.conf.urls.defaults import *
50+from django.conf.urls.defaults import patterns, include
51 
52 # special urls for flatpage test cases
53 urlpatterns = patterns('',
54diff --git a/django/contrib/flatpages/urls.py b/django/contrib/flatpages/urls.py
55index 4928930..f6276df 100644
56--- a/django/contrib/flatpages/urls.py
57+++ b/django/contrib/flatpages/urls.py
58@@ -1,4 +1,4 @@
59-from django.conf.urls.defaults import *
60+from django.conf.urls.defaults import patterns
61 
62 urlpatterns = patterns('django.contrib.flatpages.views',
63     (r'^(?P<url>.*)$', 'flatpage'),
64diff --git a/django/contrib/formtools/tests/urls.py b/django/contrib/formtools/tests/urls.py
65index b89b6e6..c3351ed 100644
66--- a/django/contrib/formtools/tests/urls.py
67+++ b/django/contrib/formtools/tests/urls.py
68@@ -2,7 +2,7 @@
69 This is a URLconf to be loaded by tests.py. Add any URLs needed for tests only.
70 """
71 
72-from django.conf.urls.defaults import *
73+from django.conf.urls.defaults import patterns
74 from django.contrib.formtools.tests import *
75 
76 urlpatterns = patterns('',
77diff --git a/django/contrib/gis/tests/geoapp/urls.py b/django/contrib/gis/tests/geoapp/urls.py
78index edaf280..e0917e6 100644
79--- a/django/contrib/gis/tests/geoapp/urls.py
80+++ b/django/contrib/gis/tests/geoapp/urls.py
81@@ -1,4 +1,4 @@
82-from django.conf.urls.defaults import *
83+from django.conf.urls.defaults import patterns
84 from feeds import feed_dict
85 
86 urlpatterns = patterns('',
87diff --git a/django/contrib/gis/tests/urls.py b/django/contrib/gis/tests/urls.py
88index 95e36c2..ed49873 100644
89--- a/django/contrib/gis/tests/urls.py
90+++ b/django/contrib/gis/tests/urls.py
91@@ -1,4 +1,4 @@
92-from django.conf.urls.defaults import *
93+from django.conf.urls.defaults import patterns, include
94 
95 urlpatterns = patterns('',
96                        (r'^geoapp/', include('django.contrib.gis.tests.geoapp.urls')),
97diff --git a/django/contrib/messages/tests/urls.py b/django/contrib/messages/tests/urls.py
98index 6252adc..51f8816 100644
99--- a/django/contrib/messages/tests/urls.py
100+++ b/django/contrib/messages/tests/urls.py
101@@ -1,4 +1,4 @@
102-from django.conf.urls.defaults import *
103+from django.conf.urls.defaults import patterns
104 from django.contrib import messages
105 from django.core.urlresolvers import reverse
106 from django.http import HttpResponseRedirect, HttpResponse
107diff --git a/django/contrib/sitemaps/tests/urls.py b/django/contrib/sitemaps/tests/urls.py
108index 6cdba36..6deb8cd 100644
109--- a/django/contrib/sitemaps/tests/urls.py
110+++ b/django/contrib/sitemaps/tests/urls.py
111@@ -1,5 +1,5 @@
112 from datetime import datetime
113-from django.conf.urls.defaults import *
114+from django.conf.urls.defaults import patterns
115 from django.contrib.sitemaps import Sitemap, GenericSitemap, FlatPageSitemap
116 from django.contrib.auth.models import User
117