Skip to content

Commit

Permalink
Update imports from django.conf.urls and avoid import *.
Browse files Browse the repository at this point in the history
  • Loading branch information
aaugustin committed Feb 6, 2013
1 parent 2d02017 commit c181344
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 36 deletions.
4 changes: 2 additions & 2 deletions accounts/profile_urls.py
Expand Up @@ -3,9 +3,9 @@
""" """


from __future__ import absolute_import from __future__ import absolute_import
from django.conf.urls.defaults import patterns, url, include from django.conf.urls import patterns, url, include
from . import views as account_views from . import views as account_views


urlpatterns = patterns('', urlpatterns = patterns('',
r'^(?P<username>[\w-]+)/$', account_views.user_profile, name='user_profile'), r'^(?P<username>[\w-]+)/$', account_views.user_profile, name='user_profile'),
) )
2 changes: 1 addition & 1 deletion accounts/urls.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import from __future__ import absolute_import


from django.conf.urls.defaults import patterns, url, include from django.conf.urls import patterns, url, include
from registration.forms import RegistrationFormUniqueEmail from registration.forms import RegistrationFormUniqueEmail
from . import views as account_views from . import views as account_views


Expand Down
21 changes: 11 additions & 10 deletions aggregator/urls.py
@@ -1,36 +1,37 @@
from __future__ import absolute_import from __future__ import absolute_import


from django.conf.urls.defaults import * from django.conf.urls import patterns, url

from . import views from . import views


urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^$', url(r'^$',
views.index, views.index,
name = 'community-index' name='community-index'
), ),
url(r'^mine/$', url(r'^mine/$',
views.my_feeds, views.my_feeds,
name = 'community-my-feeds' name='community-my-feeds'
), ),
url( url(
r'^(?P<feed_type_slug>[-\w]+)/$', r'^(?P<feed_type_slug>[-\w]+)/$',
views.feed_list, views.feed_list,
name = "community-feed-list" name='community-feed-list'
), ),
url( url(
r'^add/(?P<feed_type_slug>[-\w]+)/$', r'^add/(?P<feed_type_slug>[-\w]+)/$',
views.add_feed, views.add_feed,
name = 'community-add-feed' name='community-add-feed'
), ),
url( url(
r'^edit/(?P<feed_id>\d+)/$', r'^edit/(?P<feed_id>\d+)/$',
views.edit_feed, views.edit_feed,
name = 'community-edit-feed' name='community-edit-feed'
), ),
url( url(
r'^delete/(?P<feed_id>\d+)/$', r'^delete/(?P<feed_id>\d+)/$',
views.delete_feed, views.delete_feed,
name = 'community-delete-feed' name='community-delete-feed'
), ),
) )


2 changes: 1 addition & 1 deletion blog/urls.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import from __future__ import absolute_import


from django.conf.urls.defaults import * from django.conf.urls import patterns, url


from . import views from . import views


Expand Down
28 changes: 15 additions & 13 deletions contact/urls.py
@@ -1,26 +1,28 @@
from __future__ import absolute_import from __future__ import absolute_import


from django.conf.urls.defaults import * from django.conf.urls import patterns, url
from django.views.generic.simple import direct_to_template from django.views.generic.simple import direct_to_template

from contact_form.views import contact_form from contact_form.views import contact_form

from .forms import FoundationContactForm from .forms import FoundationContactForm


urlpatterns = patterns('', urlpatterns = patterns('',
url( url(
regex = r'^foundation/$', regex=r'^foundation/$',
view = contact_form, view=contact_form,
kwargs = dict( kwargs=dict(
form_class = FoundationContactForm, form_class=FoundationContactForm,
template_name = 'contact/foundation.html', template_name='contact/foundation.html',
), ),
name = 'contact_foundation', name='contact_foundation',
), ),
url( url(
regex = r'^sent/', regex=r'^sent/',
view = direct_to_template, view=direct_to_template,
kwargs = dict( kwargs=dict(
template = 'contact/sent.html', template='contact/sent.html',
), ),
name = 'contact_form_sent', name='contact_form_sent',
) )
) )
12 changes: 6 additions & 6 deletions django_docs/urls.py
@@ -1,5 +1,5 @@
from django.conf import settings from django.conf.urls import patterns, url
from django.conf.urls.defaults import *
from haystack.views import search_view_factory from haystack.views import search_view_factory


from docs import views from docs import views
Expand All @@ -12,7 +12,7 @@
url( url(
r'^search/$', r'^search/$',
search_view_factory(view_class=views.DocSearchView), search_view_factory(view_class=views.DocSearchView),
name = 'document-search' name='document-search'
), ),
url( url(
r'^(?P<lang>[a-z-]+)/$', r'^(?P<lang>[a-z-]+)/$',
Expand All @@ -22,12 +22,12 @@
r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/$', r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/$',
views.document, views.document,
{'url': ''}, {'url': ''},
name = 'document-index', name='document-index',
), ),
url( url(
r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/_objects/$', r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/_objects/$',
views.objects_inventory, views.objects_inventory,
name = 'objects-inv', name='objects-inv',
), ),
url( url(
r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/_images/(?P<path>.*)$', r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/_images/(?P<path>.*)$',
Expand All @@ -48,6 +48,6 @@
url( url(
r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/(?P<url>[\w./-]*)/$', r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/(?P<url>[\w./-]*)/$',
views.document, views.document,
name = 'document-detail', name='document-detail',
), ),
) )
2 changes: 1 addition & 1 deletion django_www/urls.py
@@ -1,7 +1,7 @@
from __future__ import absolute_import from __future__ import absolute_import


from django.conf import settings from django.conf import settings
from django.conf.urls.defaults import patterns, include, url from django.conf.urls import patterns, include, url
from django.contrib import admin from django.contrib import admin
from django.contrib.comments.feeds import LatestCommentFeed from django.contrib.comments.feeds import LatestCommentFeed
from django.contrib.comments.models import Comment from django.contrib.comments.models import Comment
Expand Down
3 changes: 2 additions & 1 deletion legacy/urls.py
Expand Up @@ -4,7 +4,8 @@


from __future__ import absolute_import from __future__ import absolute_import


from django.conf.urls.defaults import * from django.conf.urls import patterns

from .views import gone from .views import gone


urlpatterns = patterns('', urlpatterns = patterns('',
Expand Down
3 changes: 2 additions & 1 deletion svntogit/urls.py
Expand Up @@ -4,7 +4,8 @@


from __future__ import absolute_import from __future__ import absolute_import


from django.conf.urls.defaults import * from django.conf.urls import patterns

from .views import redirect_to_github from .views import redirect_to_github


urlpatterns = patterns('', urlpatterns = patterns('',
Expand Down

0 comments on commit c181344

Please sign in to comment.