Ticket #14675: 14675-remove-import-star-from-urlconfs.patch

django/conf/project_template/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url, include
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin

django/conf/urls/i18n.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 
 urlpatterns = patterns('',
     (r'^setlang/$', 'django.views.i18n.set_language'),

django/conf/urls/shortcut.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 
 urlpatterns = patterns('django.views',
     (r'^(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'defaults.shortcut'),

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
 

docs/intro/overview.txt

@@ -176 +176 @@
 Here's what a URLconf might look like for the ``Reporter``/``Article``
 example above::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include    
 
     urlpatterns = patterns('',
         (r'^articles/(\d{4})/$', 'news.views.year_archive'),

docs/intro/tutorial02.txt

@@ -43 +43 @@
 
       .. parsed-literal::
 
-          from django.conf.urls.defaults import *
+          from django.conf.urls.defaults import patterns, url, include
 
           # Uncomment the next two lines to enable the admin:
           **from django.contrib import admin**

docs/intro/tutorial03.txt

@@ -78 +78 @@
 
 Time for an example. Edit ``mysite/urls.py`` so it looks like this::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     from django.contrib import admin
     admin.autodiscover()
@@ -366 +366 @@
 You normally won't have to bother with writing 404 views. By default, URLconfs
 have the following line up top::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
 That takes care of setting ``handler404`` in the current module. As you can see
 in ``django/conf/urls/defaults.py``, ``handler404`` is set to
@@ -459 +459 @@
 :func:`~django.conf.urls.defaults.patterns`. Your full ``mysite/urls.py`` might
 now look like this::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     from django.contrib import admin
     admin.autodiscover()
@@ -496 +496 @@
 :func:`~django.conf.urls.defaults.include`, leaving you with::
 
     # This also imports the include function
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     
     from django.contrib import admin
     admin.autodiscover()
@@ -526 +526 @@
 lines registering the admin site. Your ``polls.urls`` file should now look like
 this::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     urlpatterns = patterns('polls.views',
         (r'^$', 'index'),

docs/intro/tutorial04.txt

@@ -220 +220 @@
 First, open the ``polls/urls.py`` URLconf. It looks like this, according to the
 tutorial so far::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     urlpatterns = patterns('polls.views',
         (r'^$', 'index'),
@@ -231 +231 @@
 
 Change it like so::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from django.views.generic import DetailView, ListView
     from polls.models import Poll
 

docs/ref/contrib/admin/index.txt

@@ -1472 +1472 @@
 ``django.contrib.admin.site`` at the URL ``/admin/`` ::
 
     # urls.py
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from django.contrib import admin
 
     admin.autodiscover()
@@ -1488 +1488 @@
 ``myproject.admin.admin_site`` at the URL ``/myadmin/`` ::
 
     # urls.py
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from myproject.admin import admin_site
 
     urlpatterns = patterns('',
@@ -1516 +1516 @@
 respectively::
 
     # urls.py
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from myproject.admin import basic_site, advanced_site
 
     urlpatterns = patterns('',

docs/ref/contrib/comments/example.txt

@@ -140 +140 @@
 
 .. code-block:: python
 
-  from django.conf.urls.defaults import *
+  from django.conf.urls.defaults import patterns, url, include
   from django.contrib.comments.feeds import LatestCommentFeed
 
   feeds = {

docs/ref/contrib/formtools/form-wizard.txt

@@ -192 +192 @@
 wizard takes a list of your :class:`~django.forms.Form` objects as
 arguments when you instantiate the Wizard::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from testapp.forms import ContactForm1, ContactForm2, ContactWizard
 
     urlpatterns = patterns('',

docs/ref/contrib/gis/tutorial.txt

@@ -702 +702 @@
 Next, edit your ``urls.py`` in the ``geodjango`` project folder to look
 as follows::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from django.contrib.gis import admin
 
     admin.autodiscover()

docs/ref/contrib/sitemaps.txt

@@ -241 +241 @@
 
 Here's an example of a :doc:`URLconf </topics/http/urls>` using both::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from django.contrib.sitemaps import FlatPageSitemap, GenericSitemap
     from blog.models import Entry
 

docs/ref/contrib/syndication.txt

@@ -80 +80 @@
 To connect a URL to this feed, put an instance of the Feed object in
 your :doc:`URLconf </topics/http/urls>`. For example::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from myproject.feeds import LatestEntriesFeed
 
     urlpatterns = patterns('',
@@ -327 +327 @@
 
 And the accompanying URLconf::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from myproject.feeds import RssSiteNewsFeed, AtomSiteNewsFeed
 
     urlpatterns = patterns('',

docs/ref/models/instances.txt

@@ -506 +506 @@
 pattern is defined by replacing the pattern tuple by a call to
 the ``url`` function)::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     url(r'^people/(\d+)/$',
         'django.views.generic.list_detail.object_detail',

docs/topics/class-based-views.txt

@@ -75 +75 @@
 instead, which is the entrypoint for class-based views::
 
     # urls.py
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from some_app.views import AboutView
 
     urlpatterns = patterns('',
@@ -86 +86 @@
 class-based view, you can simply pass the new attributes into the as_view
 method call itself::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from django.views.generic import TemplateView
 
     urlpatterns = patterns('',
@@ -135 +135 @@
 
 To build a list page of all publishers, we'd use a URLconf along these lines::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from django.views.generic import ListView
     from books.models import Publisher
 

docs/topics/generic-views.txt

@@ -48 +48 @@
 For example, here's a simple URLconf you could use to present a static "about"
 page::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from django.views.generic.simple import direct_to_template
 
     urlpatterns = patterns('',
@@ -70 +70 @@
 
 .. parsed-literal::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from django.views.generic.simple import direct_to_template
     **from books.views import about_pages**
 
@@ -150 +150 @@
 
 To build a list page of all publishers, we'd use a URLconf along these lines::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
     from django.views.generic import list_detail
     from books.models import Publisher
 

docs/topics/http/urls.txt

@@ -59 +59 @@
 
 Here's a sample URLconf::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     urlpatterns = patterns('',
         (r'^articles/2003/$', 'news.views.special_case_2003'),
@@ -70 +70 @@
 
 Notes:
 
-    * ``from django.conf.urls.defaults import *`` makes the ``patterns()``
+    * ``from django.conf.urls.defaults import patterns, url, include`` makes the ``patterns()``
       function available.
 
     * To capture a value from the URL, just put parenthesis around it.
@@ -177 +177 @@
 ``django.conf.urls.defaults.patterns()``. Always use ``patterns()`` to create
 the ``urlpatterns`` variable.
 
-Convention is to use ``from django.conf.urls.defaults import *`` at the top of
+Convention is to use ``from django.conf.urls.defaults import patterns, url, include`` at the top of
 your URLconf. This gives your module access to these objects:
 
 patterns
@@ -335 +335 @@
 
 Here's the example URLconf from the :doc:`Django overview </intro/overview>`::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     urlpatterns = patterns('',
         (r'^articles/(\d{4})/$', 'news.views.year_archive'),
@@ -350 +350 @@
 
 With this in mind, the above example can be written more concisely as::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     urlpatterns = patterns('news.views',
         (r'^articles/(\d{4})/$', 'year_archive'),
@@ -371 +371 @@
 
 Old::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     urlpatterns = patterns('',
         (r'^$', 'django.views.generic.date_based.archive_index'),
@@ -381 +381 @@
 
 New::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     urlpatterns = patterns('django.views.generic.date_based',
         (r'^$', 'archive_index'),
@@ -401 +401 @@
 For example, here's the URLconf for the `Django Web site`_ itself. It includes a
 number of other URLconfs::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     urlpatterns = patterns('',
         (r'^weblog/',        include('django_website.apps.blog.urls.blog')),
@@ -421 +421 @@
 URLconf Python module defining them as the `include`_ argument but by using
 directly the pattern list as returned by `patterns`_ instead. For example::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
     extra_patterns = patterns('',
         url(r'reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),

docs/topics/http/views.txt

@@ -143 +143 @@
 Behind the scenes, Django determines the 404 view by looking for ``handler404``.
 By default, URLconfs contain the following line::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
 That takes care of setting ``handler404`` in the current module. As you can see
 in ``django/conf/urls/defaults.py``, ``handler404`` is set to
@@ -191 +191 @@
 Behind the scenes, Django determines the error view by looking for ``handler500``.
 By default, URLconfs contain the following line::
 
-    from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import patterns, url, include
 
 That takes care of setting ``handler500`` in the current module. As you can see
 in ``django/conf/urls/defaults.py``, ``handler500`` is set to

tests/modeltests/test_client/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from django.views.generic.simple import redirect_to
 import views
 

tests/regressiontests/admin_views/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, include
 from django.contrib import admin
 import views
 import customadmin

tests/regressiontests/admin_widgets/urls.py

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

tests/regressiontests/comment_tests/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('regressiontests.comment_tests.custom_comments.views',
     url(r'^post/$',          'custom_submit_comment'),

tests/regressiontests/comment_tests/urls_admin.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, include
 from django.contrib import admin
 from django.contrib.comments.admin import CommentsAdmin
 from django.contrib.comments.models import Comment

tests/regressiontests/conditional_processing/urls.py

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

tests/regressiontests/context_processors/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 
 import views
 

tests/regressiontests/file_uploads/urls.py

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

tests/regressiontests/formwizard/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 from forms import ContactWizard, Page1, Page2, Page3
 
 urlpatterns = patterns('',

tests/regressiontests/generic_inline_admin/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, include
 from django.contrib import admin
 
 urlpatterns = patterns('',

tests/regressiontests/generic_views/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 from django.views.generic import TemplateView
 
 import views

tests/regressiontests/middleware_exceptions/urls.py

@@ -1 +1 @@
 # coding: utf-8
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 
 import views
 

tests/regressiontests/special_headers/urls.py

@@ -1 +1 @@
 # coding: utf-8
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 from django.views.generic.list_detail import object_detail
 from models import Article
 import views

tests/regressiontests/staticfiles_tests/urls/default.py

@@ -1 +1 @@
 from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('',
     url(r'^static/(?P<path>.*)$', 'django.contrib.staticfiles.views.serve'),

tests/regressiontests/syndication/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 
 import feeds
 

tests/regressiontests/templates/urls.py

@@ -1 +1 @@
 # coding: utf-8
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 from regressiontests.templates import views
 
 urlpatterns = patterns('',

tests/regressiontests/test_client_regress/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 from django.views.generic.simple import redirect_to
 import views
 

tests/regressiontests/urlpatterns_reverse/extra_urls.py

@@ -2 +2 @@
 Some extra URL patterns that are included at the top level.
 """
 
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url, include
 from views import empty_view
 
 urlpatterns = patterns('',

tests/regressiontests/urlpatterns_reverse/included_named_urls.py

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

tests/regressiontests/urlpatterns_reverse/included_named_urls2.py

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

tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url, include
 from namespace_urls import URLObject
 from views import view_class_instance
 

tests/regressiontests/urlpatterns_reverse/included_urls.py

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

tests/regressiontests/urlpatterns_reverse/included_urls2.py

@@ -5 +5 @@
 argument list.
 """
 
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 from views import empty_view
 
 urlpatterns = patterns('',

tests/regressiontests/urlpatterns_reverse/named_urls.py

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

tests/regressiontests/urlpatterns_reverse/namespace_urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url, include
 from views import view_class_instance
 
 class URLObject(object):

tests/regressiontests/urlpatterns_reverse/no_urls.py

@@ -1 @@
-#from django.conf.urls.defaults import *
+#from django.conf.urls.defaults import patterns, url, include
 

tests/regressiontests/urlpatterns_reverse/urlconf_inner.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url
 from django.template import Template, Context
 from django.http import HttpResponse
 

tests/regressiontests/urlpatterns_reverse/urlconf_outer.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url, include
 
 import urlconf_inner
 

tests/regressiontests/urlpatterns_reverse/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url, include
 from views import empty_view, absolute_kwargs_view
 
 other_patterns = patterns('',

tests/regressiontests/utils/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns
 
 import views
 

tests/regressiontests/views/urls.py

@@ -1 +1 @@
 # coding: utf-8
 from os import path
 
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, url, include
 
 from models import *
 import views

tests/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, include
 
 urlpatterns = patterns('',
     # test_client modeltest urls