Code

Ticket #14675: tests.diff

File tests.diff, 13.7 KB (added by pupeno, 3 years ago)

Explicitly included functions from urls.default in tests.

Line 
1diff --git a/tests/modeltests/test_client/urls.py b/tests/modeltests/test_client/urls.py
2index 9e0eabe..c2e7d15 100644
3--- a/tests/modeltests/test_client/urls.py
4+++ b/tests/modeltests/test_client/urls.py
5@@ -1,4 +1,4 @@
6-from django.conf.urls.defaults import *
7+from django.conf.urls.defaults import patterns
8 from django.views.generic.simple import redirect_to
9 import views
10 
11diff --git a/tests/regressiontests/admin_views/urls.py b/tests/regressiontests/admin_views/urls.py
12index f3f1fbd..57c157e 100644
13--- a/tests/regressiontests/admin_views/urls.py
14+++ b/tests/regressiontests/admin_views/urls.py
15@@ -1,4 +1,4 @@
16-from django.conf.urls.defaults import *
17+from django.conf.urls.defaults import patterns, include
18 from django.contrib import admin
19 import views
20 import customadmin
21diff --git a/tests/regressiontests/admin_widgets/urls.py b/tests/regressiontests/admin_widgets/urls.py
22index af73d53..2ad23c1 100644
23--- a/tests/regressiontests/admin_widgets/urls.py
24+++ b/tests/regressiontests/admin_widgets/urls.py
25@@ -1,5 +1,4 @@
26-
27-from django.conf.urls.defaults import *
28+from django.conf.urls.defaults import patterns, include
29 import widgetadmin
30 
31 urlpatterns = patterns('',
32diff --git a/tests/regressiontests/comment_tests/urls.py b/tests/regressiontests/comment_tests/urls.py
33index 0058689..2a16e05 100644
34--- a/tests/regressiontests/comment_tests/urls.py
35+++ b/tests/regressiontests/comment_tests/urls.py
36@@ -1,4 +1,4 @@
37-from django.conf.urls.defaults import *
38+from django.conf.urls.defaults import patterns, url
39 
40 urlpatterns = patterns('regressiontests.comment_tests.custom_comments.views',
41     url(r'^post/$',          'custom_submit_comment'),
42diff --git a/tests/regressiontests/comment_tests/urls_admin.py b/tests/regressiontests/comment_tests/urls_admin.py
43index 341285d..7958fc1 100644
44--- a/tests/regressiontests/comment_tests/urls_admin.py
45+++ b/tests/regressiontests/comment_tests/urls_admin.py
46@@ -1,4 +1,4 @@
47-from django.conf.urls.defaults import *
48+from django.conf.urls.defaults import patterns, include
49 from django.contrib import admin
50 from django.contrib.comments.admin import CommentsAdmin
51 from django.contrib.comments.models import Comment
52diff --git a/tests/regressiontests/conditional_processing/urls.py b/tests/regressiontests/conditional_processing/urls.py
53index 4dbe11a..932f0fe 100644
54--- a/tests/regressiontests/conditional_processing/urls.py
55+++ b/tests/regressiontests/conditional_processing/urls.py
56@@ -1,4 +1,4 @@
57-from django.conf.urls.defaults import *
58+from django.conf.urls.defaults import patterns
59 import views
60 
61 urlpatterns = patterns('',
62diff --git a/tests/regressiontests/context_processors/urls.py b/tests/regressiontests/context_processors/urls.py
63index 30728c8..21c0c4c 100644
64--- a/tests/regressiontests/context_processors/urls.py
65+++ b/tests/regressiontests/context_processors/urls.py
66@@ -1,4 +1,4 @@
67-from django.conf.urls.defaults import *
68+from django.conf.urls.defaults import patterns, url
69 
70 import views
71 
72diff --git a/tests/regressiontests/file_uploads/urls.py b/tests/regressiontests/file_uploads/urls.py
73index 413080e..1880a3b 100644
74--- a/tests/regressiontests/file_uploads/urls.py
75+++ b/tests/regressiontests/file_uploads/urls.py
76@@ -1,4 +1,4 @@
77-from django.conf.urls.defaults import *
78+from django.conf.urls.defaults import patterns
79 import views
80 
81 urlpatterns = patterns('',
82diff --git a/tests/regressiontests/formwizard/urls.py b/tests/regressiontests/formwizard/urls.py
83index d964bc6..e4e6e4e 100644
84--- a/tests/regressiontests/formwizard/urls.py
85+++ b/tests/regressiontests/formwizard/urls.py
86@@ -1,4 +1,4 @@
87-from django.conf.urls.defaults import *
88+from django.conf.urls.defaults import patterns, url
89 from forms import ContactWizard, Page1, Page2, Page3
90 
91 urlpatterns = patterns('',
92diff --git a/tests/regressiontests/generic_inline_admin/urls.py b/tests/regressiontests/generic_inline_admin/urls.py
93index c3e8af8..154e303 100644
94--- a/tests/regressiontests/generic_inline_admin/urls.py
95+++ b/tests/regressiontests/generic_inline_admin/urls.py
96@@ -1,4 +1,4 @@
97-from django.conf.urls.defaults import *
98+from django.conf.urls.defaults import patterns, include
99 from django.contrib import admin
100 
101 urlpatterns = patterns('',
102diff --git a/tests/regressiontests/generic_views/urls.py b/tests/regressiontests/generic_views/urls.py
103index 548d10d..5081943 100644
104--- a/tests/regressiontests/generic_views/urls.py
105+++ b/tests/regressiontests/generic_views/urls.py
106@@ -1,4 +1,4 @@
107-from django.conf.urls.defaults import *
108+from django.conf.urls.defaults import patterns, url
109 from django.views.generic import TemplateView
110 
111 import views
112diff --git a/tests/regressiontests/middleware_exceptions/urls.py b/tests/regressiontests/middleware_exceptions/urls.py
113index 5b477a4..2ace688 100644
114--- a/tests/regressiontests/middleware_exceptions/urls.py
115+++ b/tests/regressiontests/middleware_exceptions/urls.py
116@@ -1,5 +1,5 @@
117 # coding: utf-8
118-from django.conf.urls.defaults import *
119+from django.conf.urls.defaults import patterns
120 
121 import views
122 
123diff --git a/tests/regressiontests/special_headers/urls.py b/tests/regressiontests/special_headers/urls.py
124index c6b05d6..4644c69 100644
125--- a/tests/regressiontests/special_headers/urls.py
126+++ b/tests/regressiontests/special_headers/urls.py
127@@ -1,5 +1,5 @@
128 # coding: utf-8
129-from django.conf.urls.defaults import *
130+from django.conf.urls.defaults import patterns
131 from django.views.generic.list_detail import object_detail
132 from models import Article
133 import views
134diff --git a/tests/regressiontests/staticfiles_tests/urls/default.py b/tests/regressiontests/staticfiles_tests/urls/default.py
135index 061ec64..502841b 100644
136--- a/tests/regressiontests/staticfiles_tests/urls/default.py
137+++ b/tests/regressiontests/staticfiles_tests/urls/default.py
138@@ -1,5 +1,5 @@
139 from django.conf import settings
140-from django.conf.urls.defaults import *
141+from django.conf.urls.defaults import patterns, url
142 
143 urlpatterns = patterns('',
144     url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'),
145diff --git a/tests/regressiontests/syndication/urls.py b/tests/regressiontests/syndication/urls.py
146index 881fa48..7704078 100644
147--- a/tests/regressiontests/syndication/urls.py
148+++ b/tests/regressiontests/syndication/urls.py
149@@ -1,4 +1,4 @@
150-from django.conf.urls.defaults import *
151+from django.conf.urls.defaults import patterns
152 
153 import feeds
154 
155diff --git a/tests/regressiontests/templates/urls.py b/tests/regressiontests/templates/urls.py
156index 28d4133..5460f36 100644
157--- a/tests/regressiontests/templates/urls.py
158+++ b/tests/regressiontests/templates/urls.py
159@@ -1,5 +1,5 @@
160 # coding: utf-8
161-from django.conf.urls.defaults import *
162+from django.conf.urls.defaults import patterns, url
163 from regressiontests.templates import views
164 
165 urlpatterns = patterns('',
166diff --git a/tests/regressiontests/test_client_regress/urls.py b/tests/regressiontests/test_client_regress/urls.py
167index 650d80b..325ef91 100644
168--- a/tests/regressiontests/test_client_regress/urls.py
169+++ b/tests/regressiontests/test_client_regress/urls.py
170@@ -1,4 +1,4 @@
171-from django.conf.urls.defaults import *
172+from django.conf.urls.defaults import patterns, url
173 from django.views.generic.simple import redirect_to
174 import views
175 
176diff --git a/tests/regressiontests/urlpatterns_reverse/extra_urls.py b/tests/regressiontests/urlpatterns_reverse/extra_urls.py
177index c171f6d..3a56f2d 100644
178--- a/tests/regressiontests/urlpatterns_reverse/extra_urls.py
179+++ b/tests/regressiontests/urlpatterns_reverse/extra_urls.py
180@@ -2,7 +2,7 @@
181 Some extra URL patterns that are included at the top level.
182 """
183 
184-from django.conf.urls.defaults import *
185+from django.conf.urls.defaults import patterns, url, include
186 from views import empty_view
187 
188 urlpatterns = patterns('',
189diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls.py
190index b3f7903..aec96c5 100644
191--- a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py
192+++ b/tests/regressiontests/urlpatterns_reverse/included_named_urls.py
193@@ -1,4 +1,4 @@
194-from django.conf.urls.defaults import *
195+from django.conf.urls.defaults import patterns, url, include
196 from views import empty_view
197 
198 urlpatterns = patterns('',
199diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py
200index 96c42c3..65d2178 100644
201--- a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py
202+++ b/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py
203@@ -1,4 +1,4 @@
204-from django.conf.urls.defaults import *
205+from django.conf.urls.defaults import patters, url
206 from views import empty_view
207 
208 urlpatterns = patterns('',
209diff --git a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
210index 16887e2..86c48b5 100644
211--- a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
212+++ b/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
213@@ -1,4 +1,4 @@
214-from django.conf.urls.defaults import *
215+from django.conf.urls.defaults import patterns, url, include
216 from namespace_urls import URLObject
217 from views import view_class_instance
218 
219diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls.py b/tests/regressiontests/urlpatterns_reverse/included_urls.py
220index f8acf34..4c5327b 100644
221--- a/tests/regressiontests/urlpatterns_reverse/included_urls.py
222+++ b/tests/regressiontests/urlpatterns_reverse/included_urls.py
223@@ -1,4 +1,4 @@
224-from django.conf.urls.defaults import *
225+from django.conf.urls.defaults import patterns, url
226 from views import empty_view
227 
228 urlpatterns = patterns('',
229diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls2.py b/tests/regressiontests/urlpatterns_reverse/included_urls2.py
230index f414ca6..f130275 100644
231--- a/tests/regressiontests/urlpatterns_reverse/included_urls2.py
232+++ b/tests/regressiontests/urlpatterns_reverse/included_urls2.py
233@@ -5,7 +5,7 @@ each name to resolve and Django must distinguish the possibilities based on the
234 argument list.
235 """
236 
237-from django.conf.urls.defaults import *
238+from django.conf.urls.defaults import patterns, url
239 from views import empty_view
240 
241 urlpatterns = patterns('',
242diff --git a/tests/regressiontests/urlpatterns_reverse/named_urls.py b/tests/regressiontests/urlpatterns_reverse/named_urls.py
243index d8a61a1..0ee8c40 100644
244--- a/tests/regressiontests/urlpatterns_reverse/named_urls.py
245+++ b/tests/regressiontests/urlpatterns_reverse/named_urls.py
246@@ -1,4 +1,4 @@
247-from django.conf.urls.defaults import *
248+from django.conf.urls.defaults import patterns, url, include
249 from views import empty_view
250 
251 urlpatterns = patterns('',
252diff --git a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
253index 3d34049..ed32fcc 100644
254--- a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
255+++ b/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
256@@ -1,4 +1,4 @@
257-from django.conf.urls.defaults import *
258+from django.conf.urls.defaults import patterns, url, include
259 from views import view_class_instance
260 
261 class URLObject(object):
262diff --git a/tests/regressiontests/urlpatterns_reverse/no_urls.py b/tests/regressiontests/urlpatterns_reverse/no_urls.py
263index c9b9efe..a8fcc4c 100644
264--- a/tests/regressiontests/urlpatterns_reverse/no_urls.py
265+++ b/tests/regressiontests/urlpatterns_reverse/no_urls.py
266@@ -1,2 +1,2 @@
267-#from django.conf.urls.defaults import *
268+#from django.conf.urls.defaults import patterns, url, include
269 
270diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py b/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py
271index d188e06..c9f0e7b 100644
272--- a/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py
273+++ b/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py
274@@ -1,4 +1,4 @@
275-from django.conf.urls.defaults import *
276+from django.conf.urls.defaults import patterns, url
277 from django.template import Template, Context
278 from django.http import HttpResponse
279 
280diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py b/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py
281index 506e036..5d19cab 100644
282--- a/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py
283+++ b/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py
284@@ -1,4 +1,4 @@
285-from django.conf.urls.defaults import *
286+from django.conf.urls.defaults import patterns, url, include
287 
288 import urlconf_inner
289 
290diff --git a/tests/regressiontests/urlpatterns_reverse/urls.py b/tests/regressiontests/urlpatterns_reverse/urls.py
291index c603c02..ea75db7 100644
292--- a/tests/regressiontests/urlpatterns_reverse/urls.py
293+++ b/tests/regressiontests/urlpatterns_reverse/urls.py
294@@ -1,4 +1,4 @@
295-from django.conf.urls.defaults import *
296+from django.conf.urls.defaults import patterns, url, include
297 from views import empty_view, absolute_kwargs_view
298 
299 other_patterns = patterns('',
300diff --git a/tests/regressiontests/utils/urls.py b/tests/regressiontests/utils/urls.py
301index ba09d14..3d4cfe1 100644
302--- a/tests/regressiontests/utils/urls.py
303+++ b/tests/regressiontests/utils/urls.py
304@@ -1,4 +1,4 @@
305-from django.conf.urls.defaults import *
306+from django.conf.urls.defaults import patterns
307 
308 import views
309 
310diff --git a/tests/regressiontests/views/urls.py b/tests/regressiontests/views/urls.py
311index d1412cd..a1b80c1 100644
312--- a/tests/regressiontests/views/urls.py
313+++ b/tests/regressiontests/views/urls.py
314@@ -1,7 +1,7 @@
315 # coding: utf-8
316 from os import path
317 
318-from django.conf.urls.defaults import *
319+from django.conf.urls.defaults import patterns, url, include
320 
321 from models import *
322 import views
323diff --git a/tests/urls.py b/tests/urls.py
324index 01d6408..c042b6b 100644
325--- a/tests/urls.py
326+++ b/tests/urls.py
327@@ -1,4 +1,4 @@
328-from django.conf.urls.defaults import *
329+from django.conf.urls.defaults import patterns, include
330 
331 urlpatterns = patterns('',
332     # test_client modeltest urls