Context Navigation

Back to Ticket #14675

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

File 14675-remove-import-star-from-urlconfs-3.patch, 38.1 KB (added by dmclain, 14 years ago)

django/conf/urls/init.py

diff --git a/django/conf/urls/__init__.py b/django/conf/urls/__init__.py
index e69de29..6084bf8 100644

a	b
	1	from django.conf.urls.defaults import *

django/conf/urls/i18n.py

diff --git a/django/conf/urls/i18n.py b/django/conf/urls/i18n.py
index 00e2d60..34a93e2 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns
2	2
3	3	urlpatterns = patterns('',
4	4	(r'^setlang/$', 'django.views.i18n.set_language'),

django/conf/urls/shortcut.py

diff --git a/django/conf/urls/shortcut.py b/django/conf/urls/shortcut.py
index 135f3be..6eb2e55 100644

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

django/contrib/admin/options.py

diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 787f856..d1792ad 100644

                class ModelAdmin(BaseModelAdmin):
         super(ModelAdmin, self).__init__()
     def get_urls(self):
         from django.conf.urls.defaults import patterns, url
+        from django.conf.urls import patterns, url
         def wrap(view):
             def wrapper(*args, **kwargs):

django/contrib/admin/sites.py

diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py
index a0338ee..d049758 100644

                class AdminSite(object):
             class MyAdminSite(AdminSite):
                 def get_urls(self):
                     from django.conf.urls.defaults import patterns, url
+                    from django.conf.urls import patterns, url
                     urls = super(MyAdminSite, self).get_urls()
                     urls += patterns('',
-…
+               class AdminSite(object):
         return update_wrapper(inner, view)
     def get_urls(self):
         from django.conf.urls.defaults import patterns, url, include
+        from django.conf.urls import patterns, url, include
         if settings.DEBUG:
             self.check_dependencies()

django/contrib/admindocs/urls.py

diff --git a/django/contrib/admindocs/urls.py b/django/contrib/admindocs/urls.py
index 57edb56..4f50049 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url
2	2	from django.contrib.admindocs import views
3	3
4	4	urlpatterns = patterns('',

django/contrib/auth/admin.py

diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py
index 7d855d8..a8508fc 100644

                class UserAdmin(admin.ModelAdmin):
         return super(UserAdmin, self).get_form(request, obj, **defaults)
     def get_urls(self):
         from django.conf.urls.defaults import patterns
+        from django.conf.urls import patterns
         return patterns('',
             (r'^(\d+)/password/$', self.admin_site.admin_view(self.user_change_password))
         ) + super(UserAdmin, self).get_urls()

django/contrib/auth/urls.py

diff --git a/django/contrib/auth/urls.py b/django/contrib/auth/urls.py
index 42b4e8f..7106153 100644

-              a
 # 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 import patterns
 urlpatterns = patterns('',
     (r'^login/$', 'django.contrib.auth.views.login'),

django/contrib/comments/urls.py

diff --git a/django/contrib/comments/urls.py b/django/contrib/comments/urls.py
index d903779..69a0222 100644

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

django/contrib/databrowse/urls.py

diff --git a/django/contrib/databrowse/urls.py b/django/contrib/databrowse/urls.py
index 9b85d14..5c431de 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns
2	2	from django.contrib.databrowse import views
3	3
4	4	# Note: The views in this URLconf all require a 'models' argument,

django/contrib/flatpages/tests/urls.py

diff --git a/django/contrib/flatpages/tests/urls.py b/django/contrib/flatpages/tests/urls.py
index 3cffd09..e0e7a07 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, include
2	2
3	3	# special urls for flatpage test cases
4	4	urlpatterns = patterns('',

django/contrib/flatpages/urls.py

diff --git a/django/contrib/flatpages/urls.py b/django/contrib/flatpages/urls.py
index 4928930..5abb8e1 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns
2	2
3	3	urlpatterns = patterns('django.contrib.flatpages.views',
4	4	(r'^(?P<url>.*)$', 'flatpage'),

django/contrib/formtools/tests/urls.py

diff --git a/django/contrib/formtools/tests/urls.py b/django/contrib/formtools/tests/urls.py
index 6fc1e4e..d866943 100644

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

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

diff --git a/django/contrib/gis/tests/geoapp/urls.py b/django/contrib/gis/tests/geoapp/urls.py
index edaf280..6a64430 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns
2	2	from feeds import feed_dict
3	3
4	4	urlpatterns = patterns('',

django/contrib/messages/tests/urls.py

diff --git a/django/contrib/messages/tests/urls.py b/django/contrib/messages/tests/urls.py
index 5191f34..d617a1b 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns
2	2	from django.contrib import messages
3	3	from django.core.urlresolvers import reverse
4	4	from django.http import HttpResponseRedirect, HttpResponse

django/contrib/sitemaps/tests/urls.py

diff --git a/django/contrib/sitemaps/tests/urls.py b/django/contrib/sitemaps/tests/urls.py
index 03b060d..c264f94 100644

a	b
1	1	from datetime import datetime
2		from django.conf.urls.defaults import *
	2	from django.conf.urls import patterns
3	3	from django.contrib.sitemaps import Sitemap, GenericSitemap, FlatPageSitemap
4	4	from django.contrib.auth.models import User
5	5

docs/intro/overview.txt

diff --git a/docs/intro/overview.txt b/docs/intro/overview.txt
index 34572a6..737db21 100644

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

docs/intro/tutorial02.txt

diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt
index bae47c8..cff907d 100644

                activate the admin site for your installation, do these three things:
       .. parsed-literal::
           from django.conf.urls.defaults import *
+          from django.conf.urls import patterns, url, include
           # Uncomment the next two lines to enable the admin:
           **from django.contrib import admin**

docs/intro/tutorial03.txt

diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index bb851b7..5d5a9cd 100644

                point at that file::
 Time for an example. Edit ``mysite/urls.py`` so it looks like this::
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     from django.contrib import admin
     admin.autodiscover()
-…
+               It's just a normal view.
 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 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
-…
+               callback in your URLconf, you can concatenate multiple
 :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 import patterns, url, include
     from django.contrib import admin
     admin.autodiscover()
-…
+               Copy the file ``mysite/urls.py`` to ``polls/urls.py``. Then, change
 :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 import patterns, url, include
     from django.contrib import admin
     admin.autodiscover()
-…
+               URLconf by removing the leading "polls/" from each line, and removing the
 lines registering the admin site. Your ``polls.urls`` file should now look like
 this::
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     urlpatterns = patterns('polls.views',
         (r'^$', 'index'),

docs/intro/tutorial04.txt

diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt
index ded5cb2..dd8a29f 100644

                Read on for details.
 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 import patterns, url, include
     urlpatterns = patterns('polls.views',
         (r'^$', 'index'),
-…
+               tutorial so far::
 Change it like so::
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     from django.views.generic import DetailView, ListView
     from polls.models import Poll

docs/ref/contrib/admin/index.txt

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index fb48ba8..5830019 100644

                In this example, we register the default ``AdminSite`` instance
 ``django.contrib.admin.site`` at the URL ``/admin/`` ::
     # urls.py
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     from django.contrib import admin
     admin.autodiscover()
-…
+               In this example, we register the ``AdminSite`` instance
 ``myproject.admin.admin_site`` at the URL ``/myadmin/`` ::
     # urls.py
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     from myproject.admin import admin_site
     urlpatterns = patterns('',
-…
+               separate versions of the admin site -- using the ``AdminSite`` instances
 respectively::
     # urls.py
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     from myproject.admin import basic_site, advanced_site
     urlpatterns = patterns('',

docs/ref/contrib/comments/example.txt

diff --git a/docs/ref/contrib/comments/example.txt b/docs/ref/contrib/comments/example.txt
index 921fe03..0847209 100644

                enable it in your project's ``urls.py``:
 .. code-block:: python
   from django.conf.urls.defaults import *
+  from django.conf.urls import patterns, url, include
   from django.contrib.comments.feeds import LatestCommentFeed
   urlpatterns = patterns('',

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

diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt
index ea6b038..c4c6bac 100644

                deploy the new :class:`FormWizard` object a URL in ``urls.py``. The
 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 import patterns, url, include
     from testapp.forms import ContactForm1, ContactForm2, ContactWizard
     urlpatterns = patterns('',

docs/ref/contrib/gis/tutorial.txt

diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index d386180..af72eca 100644

                Let's dive in again -- create a file called ``admin.py`` inside the
 Next, edit your ``urls.py`` in the ``geodjango`` project folder to look
 as follows::
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     from django.contrib.gis import admin
     admin.autodiscover()

docs/ref/contrib/sitemaps.txt

diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index d7dcc2e..aa0162e 100644

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

docs/ref/contrib/syndication.txt

diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index 9a0aa9b..bda1dd2 100644

                latest five news items::
 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 import patterns, url, include
     from myproject.feeds import LatestEntriesFeed
     urlpatterns = patterns('',
-…
+               Here's a full example::
 And the accompanying URLconf::
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     from myproject.feeds import RssSiteNewsFeed, AtomSiteNewsFeed
     urlpatterns = patterns('',

docs/ref/models/instances.txt

diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index 02b9fae..2a1f885 100644

                reference the name rather than the view function. A named URL
 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 import patterns, url, include
     url(r'^people/(\d+)/$',
         'django.views.generic.list_detail.object_detail',

docs/topics/class-based-views.txt

diff --git a/docs/topics/class-based-views.txt b/docs/topics/class-based-views.txt
index 01d5f2f..3c31154 100644

                views themselves are classes, we point the URL to the as_view class method
 instead, which is the entrypoint for class-based views::
     # urls.py
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     from some_app.views import AboutView
     urlpatterns = patterns('',
-…
+               Alternatively, if you're only changing a few simple attributes on a
 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 import patterns, url, include
     from django.views.generic import TemplateView
     urlpatterns = patterns('',
-…
+               be using these models::
 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 import patterns, url, include
     from django.views.generic import ListView
     from books.models import Publisher

docs/topics/generic-views.txt

diff --git a/docs/topics/generic-views.txt b/docs/topics/generic-views.txt
index 9251b3a..78c3c01 100644

                URLconf tuple for a given pattern.
 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 import patterns, url, include
     from django.views.generic.simple import direct_to_template
     urlpatterns = patterns('',
-…
+               the URLconf to point to a view function:
 .. parsed-literal::
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     from django.views.generic.simple import direct_to_template
     **from books.views import about_pages**
-…
+               be using these models::
 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 import patterns, url, include
     from django.views.generic import list_detail
     from books.models import Publisher

docs/topics/http/urls.txt

diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index a5fb0c9..bd6a2f5 100644

                algorithm the system follows to determine which Python code to execute:
 . Django loads that Python module and looks for the variable
        ``urlpatterns``. This should be a Python list, in the format returned by
        the function :func:`django.conf.urls.defaults.patterns`.
+       the function :func:`django.conf.urls.patterns`.
 . Django runs through each URL pattern, in order, and stops at the first
        one that matches the requested URL.
-…
+               Example
 Here's a sample URLconf::
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     urlpatterns = patterns('',
         (r'^articles/2003/$', 'news.views.special_case_2003'),
-…
+               Here's a sample URLconf::
 Notes:
-    * ``from django.conf.urls.defaults import *`` makes the ``patterns()``
-      function available.
     * To capture a value from the URL, just put parenthesis around it.
     * There's no need to add a leading slash, because every URL has that. For
-…
+               Syntax of the urlpatterns variable
 ==================================
 ``urlpatterns`` should be a Python list, in the format returned by the function
 :func:`django.conf.urls.defaults.patterns`. Always use ``patterns()`` to create
+:func:`django.conf.urls.patterns`. Always use ``patterns()`` to create
 the ``urlpatterns`` variable.
+Convention is to use ``from django.conf.urls.defaults import *`` at the top of
+your URLconf. This gives your module access to these objects:
+``django.conf.urls`` also defines some other functions you'll want to use:
 .. module:: django.conf.urls.defaults
-…
+               code duplication.
 Here's the example URLconf from the :doc:`Django overview </intro/overview>`::
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     urlpatterns = patterns('',
         (r'^articles/(\d{4})/$', 'news.views.year_archive'),
-…
+               each view function.
 With this in mind, the above example can be written more concisely as::
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     urlpatterns = patterns('news.views',
         (r'^articles/(\d{4})/$', 'year_archive'),
-…
+               Just add multiple ``patterns()`` objects together, like this:
 Old::
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     urlpatterns = patterns('',
         (r'^$', 'django.views.generic.date_based.archive_index'),
-…
+               Old::
 New::
     from django.conf.urls.defaults import *
+    from django.conf.urls import patterns, url, include
     urlpatterns = patterns('django.views.generic.date_based',
         (r'^$', 'archive_index'),
-…
+               essentially "roots" a set of URLs below other ones.
 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 import patterns, url, include
     urlpatterns = patterns('',
         (r'^weblog/',        include('django_website.apps.blog.urls.blog')),
-…
+               Another possibility is to include additional URL patterns not by specifying the
 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 import patterns, url, include
     extra_patterns = patterns('',
         url(r'reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),

docs/topics/http/views.txt

diff --git a/docs/topics/http/views.txt b/docs/topics/http/views.txt
index 562be53..2e8f03d 100644

                URLconf, like so::
 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 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
-…
+               URLconf, like so::
 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 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

diff --git a/tests/modeltests/test_client/urls.py b/tests/modeltests/test_client/urls.py
index 57746d7..23e2133 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns
2	2	from django.views.generic import RedirectView
3	3	import views
4	4

tests/regressiontests/admin_views/customadmin.py

diff --git a/tests/regressiontests/admin_views/customadmin.py b/tests/regressiontests/admin_views/customadmin.py
index c31d379..760e93f 100644

-              a
 """
 A second, custom AdminSite -- see tests.CustomAdminSiteTests.
 """
 from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 from django.contrib import admin
 from django.http import HttpResponse

tests/regressiontests/admin_views/urls.py

diff --git a/tests/regressiontests/admin_views/urls.py b/tests/regressiontests/admin_views/urls.py
index f3f1fbd..7320a3c 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, include
2	2	from django.contrib import admin
3	3	import views
4	4	import customadmin

tests/regressiontests/admin_widgets/urls.py

diff --git a/tests/regressiontests/admin_widgets/urls.py b/tests/regressiontests/admin_widgets/urls.py
index af73d53..9e6bc12 100644

a	b
1
2		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, include
3	2	import widgetadmin
4	3
5	4	urlpatterns = patterns('',

tests/regressiontests/comment_tests/urls.py

diff --git a/tests/regressiontests/comment_tests/urls.py b/tests/regressiontests/comment_tests/urls.py
index a2a4d09..d1a4ec0 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url
2	2	from django.contrib.comments.feeds import LatestCommentFeed
3	3
4	4	feeds = {

tests/regressiontests/comment_tests/urls_admin.py

diff --git a/tests/regressiontests/comment_tests/urls_admin.py b/tests/regressiontests/comment_tests/urls_admin.py
index d7e1a4e..79a1b75 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, include
2	2	from django.contrib import admin
3	3	from django.contrib.comments.admin import CommentsAdmin
4	4	from django.contrib.comments.models import Comment

tests/regressiontests/conditional_processing/urls.py

diff --git a/tests/regressiontests/conditional_processing/urls.py b/tests/regressiontests/conditional_processing/urls.py
index 8c1f465..d84030e 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns
2	2	import views
3	3
4	4	urlpatterns = patterns('',

tests/regressiontests/context_processors/urls.py

diff --git a/tests/regressiontests/context_processors/urls.py b/tests/regressiontests/context_processors/urls.py
index 7e8ba96..29153fa 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url
2	2
3	3	import views
4	4

tests/regressiontests/file_uploads/urls.py

diff --git a/tests/regressiontests/file_uploads/urls.py b/tests/regressiontests/file_uploads/urls.py
index 413080e..96b160e 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns
2	2	import views
3	3
4	4	urlpatterns = patterns('',

tests/regressiontests/formwizard/urls.py

diff --git a/tests/regressiontests/formwizard/urls.py b/tests/regressiontests/formwizard/urls.py
index d964bc6..cdac27a 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url
2	2	from forms import ContactWizard, Page1, Page2, Page3
3	3
4	4	urlpatterns = patterns('',

tests/regressiontests/generic_inline_admin/urls.py

diff --git a/tests/regressiontests/generic_inline_admin/urls.py b/tests/regressiontests/generic_inline_admin/urls.py
index c3e8af8..f415872 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, include
2	2	from django.contrib import admin
3	3
4	4	urlpatterns = patterns('',

tests/regressiontests/generic_views/urls.py

diff --git a/tests/regressiontests/generic_views/urls.py b/tests/regressiontests/generic_views/urls.py
index 067c1f6..d0b949f 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url
2	2	from django.views.generic import TemplateView
3	3	from django.views.decorators.cache import cache_page
4	4

tests/regressiontests/middleware/extra_urls.py

diff --git a/tests/regressiontests/middleware/extra_urls.py b/tests/regressiontests/middleware/extra_urls.py
index b2a8902..1aee48f 100644

a	b
1		from django.conf.urls~~.defaults~~ import patterns
	1	from django.conf.urls import patterns
2	2
3	3	urlpatterns = patterns('',
4	4	(r'^middleware/customurlconf/noslash$', 'view'),

tests/regressiontests/middleware/urls.py

diff --git a/tests/regressiontests/middleware/urls.py b/tests/regressiontests/middleware/urls.py
index 88a4b37..217e3ae 100644

a	b
1		from django.conf.urls~~.defaults~~ import patterns
	1	from django.conf.urls import patterns
2	2
3	3	urlpatterns = patterns('',
4	4	(r'^noslash$', 'view'),

tests/regressiontests/middleware_exceptions/urls.py

diff --git a/tests/regressiontests/middleware_exceptions/urls.py b/tests/regressiontests/middleware_exceptions/urls.py
index 72c690f..ae78a65 100644

a	b
1	1	# coding: utf-8
2		from django.conf.urls.defaults import *
	2	from django.conf.urls import patterns
3	3
4	4	import views
5	5

tests/regressiontests/special_headers/urls.py

diff --git a/tests/regressiontests/special_headers/urls.py b/tests/regressiontests/special_headers/urls.py
index 5d223fd..db19ab9 100644

a	b
1	1	# coding: utf-8
2		from django.conf.urls.defaults import *
	2	from django.conf.urls import patterns
3	3	from django.views.generic.list_detail import object_detail
4	4	from models import Article
5	5	import views

tests/regressiontests/syndication/urls.py

diff --git a/tests/regressiontests/syndication/urls.py b/tests/regressiontests/syndication/urls.py
index 1f7ab73..ddbc7a1 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns
2	2
3	3	import feeds
4	4

tests/regressiontests/templates/urls.py

diff --git a/tests/regressiontests/templates/urls.py b/tests/regressiontests/templates/urls.py
index 28d4133..96e1ea2 100644

a	b
1	1	# coding: utf-8
2		from django.conf.urls.defaults import *
	2	from django.conf.urls import patterns, url
3	3	from regressiontests.templates import views
4	4
5	5	urlpatterns = patterns('',

tests/regressiontests/test_client_regress/urls.py

diff --git a/tests/regressiontests/test_client_regress/urls.py b/tests/regressiontests/test_client_regress/urls.py
index 121f4df..fd314e6 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url
2	2	from django.views.generic import RedirectView
3	3	import views
4	4

tests/regressiontests/urlpatterns_reverse/extra_urls.py

diff --git a/tests/regressiontests/urlpatterns_reverse/extra_urls.py b/tests/regressiontests/urlpatterns_reverse/extra_urls.py
index c171f6d..4dbfb90 100644

-              a
 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('',

tests/regressiontests/urlpatterns_reverse/included_named_urls.py

diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls.py
index b3f7903..32d2b29 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url, include
2	2	from views import empty_view
3	3
4	4	urlpatterns = patterns('',

tests/regressiontests/urlpatterns_reverse/included_named_urls2.py

diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py
index 96c42c3..2a9779d 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url
2	2	from views import empty_view
3	3
4	4	urlpatterns = patterns('',

tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py

diff --git a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
index 16887e2..c878f97 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url, include
2	2	from namespace_urls import URLObject
3	3	from views import view_class_instance
4	4

tests/regressiontests/urlpatterns_reverse/included_urls.py

diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls.py b/tests/regressiontests/urlpatterns_reverse/included_urls.py
index f8acf34..ae2c626 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url
2	2	from views import empty_view
3	3
4	4	urlpatterns = patterns('',

tests/regressiontests/urlpatterns_reverse/included_urls2.py

diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls2.py b/tests/regressiontests/urlpatterns_reverse/included_urls2.py
index f414ca6..b6fb4c6 100644

                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('',

tests/regressiontests/urlpatterns_reverse/named_urls.py

diff --git a/tests/regressiontests/urlpatterns_reverse/named_urls.py b/tests/regressiontests/urlpatterns_reverse/named_urls.py
index d8a61a1..fa71f53 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url, include
2	2	from views import empty_view
3	3
4	4	urlpatterns = patterns('',

tests/regressiontests/urlpatterns_reverse/namespace_urls.py

diff --git a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
index 3d34049..451bb68 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url, include
2	2	from views import view_class_instance
3	3
4	4	class URLObject(object):

tests/regressiontests/urlpatterns_reverse/no_urls.py

diff --git a/tests/regressiontests/urlpatterns_reverse/no_urls.py b/tests/regressiontests/urlpatterns_reverse/no_urls.py
index c9b9efe..5b1959c 100644

a	b
1		#from django.conf.urls.defaults import *
	1	#from django.conf.urls import patterns, url, include
2	2

tests/regressiontests/urlpatterns_reverse/urlconf_inner.py

diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py b/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py
index e981962..4d3fb74 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url
2	2	from django.template import Template, Context
3	3	from django.http import HttpResponse
4	4

tests/regressiontests/urlpatterns_reverse/urlconf_outer.py

diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py b/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py
index 506e036..0762fc5 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url, include
2	2
3	3	import urlconf_inner
4	4

tests/regressiontests/urlpatterns_reverse/urls.py

diff --git a/tests/regressiontests/urlpatterns_reverse/urls.py b/tests/regressiontests/urlpatterns_reverse/urls.py
index c603c02..23d4af4 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, url, include
2	2	from views import empty_view, absolute_kwargs_view
3	3
4	4	other_patterns = patterns('',

tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py

diff --git a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py b/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py
index c2e0d32..7a3e220 100644

-              a
 # Used by the ErrorHandlerResolutionTests test case.
 from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 urlpatterns = patterns('')

tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py

diff --git a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py b/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py
index 00f25a7..c3d4855 100644

-              a
 # 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('')

tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py

diff --git a/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py b/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py
index 75a195e..0e58a15 100644

-              a
 # 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('',

tests/regressiontests/utils/urls.py

diff --git a/tests/regressiontests/utils/urls.py b/tests/regressiontests/utils/urls.py
index ba09d14..9e90a64 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns
2	2
3	3	import views
4	4

tests/regressiontests/views/urls.py

diff --git a/tests/regressiontests/views/urls.py b/tests/regressiontests/views/urls.py
index 32f03b4..505dbfc 100644

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

tests/urls.py

diff --git a/tests/urls.py b/tests/urls.py
index 77a7578..4d34c17 100644

a	b
1		from django.conf.urls.defaults import *
	1	from django.conf.urls import patterns, include
2	2
3	3
4	4	urlpatterns = patterns('',

Download in other formats:

Original Format

Issues

Context Navigation

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

Download in other formats: