Permalink
Browse files

bug 873833, update the imports of the url pattern functions for

Django>=1.4, r=Pike
  • Loading branch information...
1 parent 7639482 commit cfaabe90b3d11df98bc62ef8ea3d66bf2929502a @jezdez jezdez committed May 22, 2013
View
@@ -4,7 +4,7 @@
'Url mappings for accounts app'
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
urlpatterns = patterns('accounts.views',
(r'^login', 'login'),
View
@@ -5,7 +5,7 @@
'''URL mappings for the bugsy application.
'''
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
urlpatterns = patterns('bugsy.views',
(r'^$', 'index'),
View
@@ -5,7 +5,7 @@
'''URL mappings for the l10n_site integration pages.
'''
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
urlpatterns = patterns('homepage.views',
(r'^$', 'index'),
View
@@ -5,7 +5,7 @@
'''URL mappings for l10nstats application.
'''
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
urlpatterns = patterns('l10nstats.views',
(r'^$', 'index'),
View
@@ -5,7 +5,7 @@
'''URL mappings for the privacy app.
'''
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
urlpatterns = patterns('privacy.views',
(r'^(?P<id>\d+)?$', 'show_policy'),
View
@@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
urlpatterns = patterns('pushes.views',
(r'^pushes/(?P<repo_name>.+)?$', 'pushlog'),
View
@@ -5,7 +5,7 @@
'''URL mappings for the shipping app.
'''
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
urlpatterns = patterns('shipping.views',
(r'^/?$', 'index'),
View
@@ -5,7 +5,7 @@
'''URL mappings for the tinder app.
'''
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
from views import BuildsForChangeFeed
View
@@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
from webby.feeds import AllOptinsFeed, PendingOptinsFeed
urlpatterns = patterns('webby.views',
View
23 urls.py
@@ -2,13 +2,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from django.conf.urls.defaults import *
+from django.conf.urls import include, patterns, url
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.conf import settings
from django.http import HttpResponse
-import base64
-import re
-
from funfactory.monkeypatches import patch
patch()
@@ -34,20 +31,14 @@ def simple_x_frame_view(request):
# (r'^dashboard/', include('dashboard.foo.urls')),
(r'^privacy/', include('privacy.urls')),
(r'.*/__history__.html$', simple_x_frame_view),
- (r'^builds/',
- include('tinder.urls')),
+ (r'^builds/', include('tinder.urls')),
(r'^source/', include('pushes.urls')),
(r'^dashboard/', include('l10nstats.urls')),
- (r'^shipping',
- include('shipping.urls')),
- (r'^bugs/',
- include('bugsy.urls')),
- (r'^webby/',
- include('webby.urls')),
- (r'^accounts/',
- include('accounts.urls')),
- (r'^',
- include('homepage.urls')),
+ (r'^shipping', include('shipping.urls')),
+ (r'^bugs/', include('bugsy.urls')),
+ (r'^webby/', include('webby.urls')),
+ (r'^accounts/', include('accounts.urls')),
+ (r'^', include('homepage.urls')),
# Uncomment the admin/doc line below and add 'django.contrib.admindocs'
# to INSTALLED_APPS to enable admin documentation:

0 comments on commit cfaabe9

Please sign in to comment.