summaryrefslogtreecommitdiff
path: root/tests/admin_custom_urls
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-04-01 20:46:34 -0400
committerTim Graham <timograham@gmail.com>2014-04-03 07:28:10 -0400
commitd73d0e071c1b4c86d57994a0ab55a74cfe80cdf5 (patch)
treef36eebaf1cdd8bd07503b3a538e7d875ff8d29b4 /tests/admin_custom_urls
parente6ced2bb086396b57601d04ad5b3ba347d1eb785 (diff)
downloaddjango-d73d0e071c1b4c86d57994a0ab55a74cfe80cdf5.tar.gz
Fixed #22218 -- Deprecated django.conf.urls.patterns.
Thanks Carl Meyer for the suggestion and Alex Gaynor and Carl for reviews.
Diffstat (limited to 'tests/admin_custom_urls')
-rw-r--r--tests/admin_custom_urls/models.py6
-rw-r--r--tests/admin_custom_urls/urls.py8
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/admin_custom_urls/models.py b/tests/admin_custom_urls/models.py
index 121e03b860..51725d4253 100644
--- a/tests/admin_custom_urls/models.py
+++ b/tests/admin_custom_urls/models.py
@@ -35,7 +35,7 @@ class ActionAdmin(admin.ModelAdmin):
def get_urls(self):
# Add the URL of our custom 'add_view' view to the front of the URLs
# list. Remove the existing one(s) first
- from django.conf.urls import patterns, url
+ from django.conf.urls import url
def wrap(view):
def wrapper(*args, **kwargs):
@@ -46,9 +46,9 @@ class ActionAdmin(admin.ModelAdmin):
view_name = '%s_%s_add' % info
- return patterns('',
+ return [
url(r'^!add/$', wrap(self.add_view), name=view_name),
- ) + self.remove_url(view_name)
+ ] + self.remove_url(view_name)
class Person(models.Model):
diff --git a/tests/admin_custom_urls/urls.py b/tests/admin_custom_urls/urls.py
index 5fe9ca89fb..1d14a09161 100644
--- a/tests/admin_custom_urls/urls.py
+++ b/tests/admin_custom_urls/urls.py
@@ -1,7 +1,7 @@
-from django.conf.urls import patterns, include
+from django.conf.urls import include, url
from django.contrib import admin
-urlpatterns = patterns('',
- (r'^admin/', include(admin.site.urls)),
-)
+urlpatterns = [
+ url(r'^admin/', include(admin.site.urls)),
+]