Ticket #14675: contrib-apps.diff

django/contrib/admindocs/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 from django.contrib.admindocs import views
 
 urlpatterns = patterns('',

django/contrib/auth/urls.py

@@ -2 +2 @@
 # provided as a convenience to those who want to deploy these URLs elsewhere.
 # This file is also used to provide a reliable view deployment for test purposes.
 
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 
 urlpatterns = patterns('',
     (r'^login/$', 'django.contrib.auth.views.login'),

django/contrib/comments/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('django.contrib.comments.views',
     url(r'^post/$',          'comments.post_comment',       name='comments-post-comment'),

django/contrib/databrowse/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from django.contrib.databrowse import views
 
 # Note: The views in this URLconf all require a 'models' argument,

django/contrib/flatpages/tests/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, include
 
 # special urls for flatpage test cases
 urlpatterns = patterns('',

django/contrib/flatpages/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 
 urlpatterns = patterns('django.contrib.flatpages.views',
     (r'^(?P<url>.*)$', 'flatpage'),

django/contrib/formtools/tests/urls.py

@@ -2 +2 @@
 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.defaults import patterns
 from django.contrib.formtools.tests import *
 
 urlpatterns = patterns('',

django/contrib/gis/tests/geoapp/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from feeds import feed_dict
 
 urlpatterns = patterns('',

django/contrib/gis/tests/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, include
 
 urlpatterns = patterns('',
                        (r'^geoapp/', include('django.contrib.gis.tests.geoapp.urls')),

django/contrib/messages/tests/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from django.contrib import messages
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, HttpResponse

django/contrib/sitemaps/tests/urls.py

@@ -1 +1 @@
 from datetime import datetime
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from django.contrib.sitemaps import Sitemap, GenericSitemap, FlatPageSitemap
 from django.contrib.auth.models import User