From fcde3f0e6ed8d2cd3509de660367c16fa537c7c9 Mon Sep 17 00:00:00 2001 From: Collin Anderson Date: Tue, 9 Sep 2014 11:29:10 -0400 Subject: [PATCH] example django app: removed warnings on django 1.8 compatible with django 1.4+ --- .../frameworks/django/djangotest/testing/urls.py | 13 +++++++------ examples/frameworks/django/djangotest/urls.py | 9 ++++----- .../django/testing/testing/apps/someapp/urls.py | 11 ++++++----- examples/frameworks/django/testing/testing/urls.py | 8 ++++---- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/examples/frameworks/django/djangotest/testing/urls.py b/examples/frameworks/django/djangotest/testing/urls.py index 85a5c4e1..e94d1ed6 100644 --- a/examples/frameworks/django/djangotest/testing/urls.py +++ b/examples/frameworks/django/djangotest/testing/urls.py @@ -1,7 +1,8 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls.defaults import url -urlpatterns = patterns('', - url(r'^acsv$', 'testing.views.acsv'), - url(r'^$', 'testing.views.home'), - -) +from . import views + +urlpatterns = [ + url(r'^acsv$', views.acsv), + url(r'^$', views.home), +] diff --git a/examples/frameworks/django/djangotest/urls.py b/examples/frameworks/django/djangotest/urls.py index 2f89ea04..5754f8a0 100755 --- a/examples/frameworks/django/djangotest/urls.py +++ b/examples/frameworks/django/djangotest/urls.py @@ -1,6 +1,5 @@ +from django.conf.urls.defaults import include, url -from django.conf.urls.defaults import patterns,include - -urlpatterns = patterns('', - (r'^', include("testing.urls")), -) +urlpatterns = [ + url(r'^', include("testing.urls")), +] diff --git a/examples/frameworks/django/testing/testing/apps/someapp/urls.py b/examples/frameworks/django/testing/testing/apps/someapp/urls.py index 2114f6ad..c1a48263 100644 --- a/examples/frameworks/django/testing/testing/apps/someapp/urls.py +++ b/examples/frameworks/django/testing/testing/apps/someapp/urls.py @@ -1,7 +1,8 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import url -urlpatterns = patterns('', - url(r'^acsv$', 'testing.apps.someapp.views.acsv'), - url(r'^$', 'testing.apps.someapp.views.home'), +from . import views -) +urlpatterns = [ + url(r'^acsv$', views.acsv), + url(r'^$', views.home), +] diff --git a/examples/frameworks/django/testing/testing/urls.py b/examples/frameworks/django/testing/testing/urls.py index 00818ac3..4c06a38f 100644 --- a/examples/frameworks/django/testing/testing/urls.py +++ b/examples/frameworks/django/testing/testing/urls.py @@ -1,10 +1,10 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url # Uncomment the next two lines to enable the admin: from django.contrib import admin admin.autodiscover() -urlpatterns = patterns('', +urlpatterns = [ # Examples: # url(r'^$', 'testing.views.home', name='home'), # url(r'^testing/', include('testing.foo.urls')), @@ -15,5 +15,5 @@ urlpatterns = patterns('', # Uncomment the next line to enable the admin: url(r'^admin/', include(admin.site.urls)), - (r'^', include("testing.apps.someapp.urls")), -) + url(r'^', include("testing.apps.someapp.urls")), +]