Skip to content

Commit

Permalink
Removed usage of django.conf.urls.patterns().
Browse files Browse the repository at this point in the history
  • Loading branch information
timgraham committed Aug 25, 2014
1 parent c8eef02 commit 46b1d7b
Show file tree
Hide file tree
Showing 12 changed files with 51 additions and 61 deletions.
10 changes: 5 additions & 5 deletions accounts/profile_urls.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"""
URLs for the profile pages (under ~)
"""
from django.conf.urls import url

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

urlpatterns = patterns('',
r'^(?P<username>[\w-]+)/$', account_views.user_profile, name='user_profile'),
)

urlpatterns = [
url(r'^(?P<username>[\w-]+)/$', account_views.user_profile, name='user_profile'),
]
10 changes: 4 additions & 6 deletions accounts/urls.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
from __future__ import absolute_import

from django.conf.urls import patterns, url, include
from django.contrib.auth import views as auth_views
from django.conf.urls import url, include

from registration.forms import RegistrationFormUniqueEmail
from registration.backends.default.views import RegistrationView

from . import views as account_views

urlpatterns = patterns('',

urlpatterns = [
url(
r'^register/$',
RegistrationView.as_view(form_class=RegistrationFormUniqueEmail),
Expand All @@ -22,4 +20,4 @@
url(r'^_trac/userinfo/$', account_views.json_user_info),
url(r'', include('django.contrib.auth.urls')),
url(r'', include('registration.backends.default.urls')),
)
]
9 changes: 3 additions & 6 deletions aggregator/urls.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
from __future__ import absolute_import

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

from . import views

urlpatterns = patterns('',
urlpatterns = [
url(r'^$',
views.index,
name='community-index'
Expand Down Expand Up @@ -33,5 +31,4 @@
views.delete_feed,
name='community-delete-feed'
),
)

]
9 changes: 4 additions & 5 deletions blog/urls.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
from __future__ import absolute_import

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

from . import views

urlpatterns = patterns('',

urlpatterns = [
url(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>[\w-]+)/$',
views.BlogDateDetailView.as_view()
),
Expand All @@ -21,4 +20,4 @@
views.BlogArchiveIndexView.as_view(),
name="blog-index"
),
)
]
9 changes: 4 additions & 5 deletions contact/urls.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from __future__ import absolute_import

from django.conf.urls import patterns, url
from django.conf.urls import url
from django.views.generic import TemplateView

from .views import ContactFoundation

urlpatterns = patterns('',

urlpatterns = [
url(r'^foundation/$', ContactFoundation.as_view(), name='contact_foundation'),
url(r'^sent/$', TemplateView.as_view(template_name='contact/sent.html'), name='contact_form_sent'),
)
]
7 changes: 4 additions & 3 deletions django_docs/urls.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from django.conf.urls import patterns, url, include
from django.conf.urls import url
from django.http import HttpResponse

from docs.sitemaps import DocsSitemap
from docs.urls import urlpatterns as docs_urlpatterns

sitemaps = {'docs': DocsSitemap}

urlpatterns = docs_urlpatterns + patterns('',

urlpatterns = docs_urlpatterns + [
url(r'^sitemap\.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
url(r'^google79eabba6bf6fd6d3\.html$', lambda req: HttpResponse('google-site-verification: google79eabba6bf6fd6d3.html')),
)
]
9 changes: 5 additions & 4 deletions django_www/urls.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from __future__ import absolute_import

from django.conf.urls import patterns, include, url
from django.conf.urls import include, url
from django.contrib import admin
from django.contrib.flatpages.views import flatpage
from django.contrib.sitemaps import FlatPageSitemap
from django.contrib.sitemaps import views as sitemap_views
from django.shortcuts import render
Expand All @@ -22,7 +21,8 @@
'flatpages': FlatPageSitemap,
}

urlpatterns = patterns('',

urlpatterns = [
url(r'^$', TemplateView.as_view(template_name='homepage.html'), name="homepage"),
url(r'^accounts/', include('accounts.urls')),
url(r'^admin/', include(admin.site.urls)),
Expand Down Expand Up @@ -60,7 +60,8 @@
url(r'^download/', include('releases.urls')),
url(r'^svntogit/', include('svntogit.urls')),
url(r'', include('legacy.urls')),
)
]


@requires_csrf_token
def handler500(request):
Expand Down
7 changes: 4 additions & 3 deletions docs/urls.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from django.conf.urls import patterns, url
from django.conf.urls import url

from haystack.views import search_view_factory

from . import views

urlpatterns = patterns('',

urlpatterns = [
url(
r'^$',
views.index,
Expand Down Expand Up @@ -58,4 +59,4 @@
r'^pots/(?P<pot_name>\w+\.pot)$',
views.pot_file,
),
)
]
16 changes: 7 additions & 9 deletions legacy/urls.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
"""
Legacy URLs for documentation pages.
"""

from __future__ import absolute_import

from django.conf.urls import patterns
from django.conf.urls import url

from .views import gone

urlpatterns = patterns('',
(r'^comments/', gone),
(r'^rss/comments/$', gone),
(r'^documentation', gone),
)

urlpatterns = [
url(r'^comments/', gone),
url(r'^rss/comments/$', gone),
url(r'^documentation', gone),
]
8 changes: 3 additions & 5 deletions releases/urls.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
from __future__ import absolute_import, unicode_literals

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

from .views import index, redirect

urlpatterns = patterns('',
urlpatterns = [
url(r'^$', index, name='download'),
url(r'^([0-9a-z_.-]+)/(tarball|checksum|egg)/$', redirect, name='download-redirect'),
)
]
11 changes: 4 additions & 7 deletions svntogit/urls.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
"""
Legacy URLs for changesets.
"""

from __future__ import absolute_import

from django.conf.urls import patterns
from django.conf.urls import url

from .views import redirect_to_github

urlpatterns = patterns('',
(r'^(\d+)/?$', redirect_to_github),
)
urlpatterns = [
url(r'^(\d+)/?$', redirect_to_github),
]
7 changes: 4 additions & 3 deletions tracdb/urls.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from django.conf.urls import patterns, url
from django.conf.urls import url

from . import views

urlpatterns = patterns('',
urlpatterns = [
url(
r'^bouncing/$',
views.bouncing_tickets,
name='bouncing_tickets',
),
)
]

0 comments on commit 46b1d7b

Please sign in to comment.