Merge pull request #18 from jmsfwk/master

Fix #17 Convert to new style urls

QUICK_START.rst

@@ -180,7 +180,7 @@ Add the following line to ``urlpatterns`` of your `urls` module.
 
 .. code-block:: python
 
-    urlpatterns = patterns('',
+    urlpatterns = [
         # ...
 
         # DB Store plugin URLs
@@ -195,7 +195,7 @@ Add the following line to ``urlpatterns`` of your `urls` module.
 
         # ...
 
-        )
+        ]
 
 Update the database
 ^^^^^^^^^^^^^^^^^^^

docs/quickstart.rst

@@ -180,7 +180,7 @@ Add the following line to ``urlpatterns`` of your `urls` module.
 
 .. code-block:: python
 
-    urlpatterns = patterns('',
+    urlpatterns = [
         # ...
 
         # DB Store plugin URLs
@@ -195,7 +195,7 @@ Add the following line to ``urlpatterns`` of your `urls` module.
 
         # ...
 
-        )
+        ]
 
 Update the database
 ^^^^^^^^^^^^^^^^^^^

examples/mezzanine_example/urls.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 
@@ -41,17 +41,17 @@ admin.autodiscover()
 # You can also change the ``home`` view to add your own functionality
 # to the project's homepage.
 
-urlpatterns = i18n_patterns("",
+urlpatterns = i18n_patterns([
     # Change the admin prefix here to use an alternate URL for the
     # admin interface, which would be marginally more secure.
     ("^admin/", include(admin.site.urls)),
-)
+])
 
 # ***********
 # Fobi patterns
 # ***********
 
-urlpatterns += patterns('',
+urlpatterns += [
     # DB Store plugin URLs
     url(r'^fobi/plugins/form-handlers/db-store/',
         include('fobi.contrib.plugins.form_handlers.db_store.urls')),
@@ -66,13 +66,13 @@ urlpatterns += patterns('',
 
     # django-fobi public forms contrib app:
     #url(r'^', include('fobi.contrib.apps.public_forms.urls')),
-    )
+    ]
 
 # ***********
 # End fobi patterns
 # ***********
 
-urlpatterns += patterns('',
+urlpatterns += [
 
     # We don't want to presume how your homepage works, so here are a
     # few patterns you can use to set it up.
@@ -140,7 +140,7 @@ urlpatterns += patterns('',
 
     # ("^%s/" % settings.SITE_PREFIX, include("mezzanine.urls"))
 
-)
+]
 
 # Adds ``STATIC_URL`` to the context of error pages, so that error
 # pages can use JS, CSS and images.

examples/quick_start/quick_start/urls.py

@@ -1,7 +1,7 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.contrib import admin
 
-urlpatterns = patterns('',
+urlpatterns = [
     # Examples:
     # url(r'^$', 'quick_start.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
@@ -20,4 +20,4 @@ urlpatterns = patterns('',
     # Edit URLs
     url(r'^fobi/', include('fobi.urls.edit')),
                            #, namespace='fobi'
-)
+]

examples/simple/foo/urls.py

@@ -1,5 +1,5 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
-urlpatterns = patterns('foo.views',
-    url(r'^endpoint/$', view='endpoint', name='foo.endpoint'),
-    )
+urlpatterns = [
+    url(r'^endpoint/$', view='foo.views.endpoint', name='foo.endpoint'),
+    ]

examples/simple/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 
 from django.conf import settings
 from django.contrib import admin
@@ -27,7 +27,7 @@ FOBI_EDIT_URLS_PREFIX = ''
 if DEFAULT_THEME in ('simple', 'djangocms_admin_style_theme'):
     FOBI_EDIT_URLS_PREFIX = 'admin/'
 
-urlpatterns = patterns('',
+urlpatterns = [
     # DB Store plugin URLs
     url(r'^fobi/plugins/form-handlers/db-store/',
         include('fobi.contrib.plugins.form_handlers.db_store.urls')), #,namespace='fobi'
@@ -51,7 +51,7 @@ urlpatterns = patterns('',
 
     # django-fobi public forms contrib app:
     #url(r'^', include('fobi.contrib.apps.public_forms.urls')),
-    )
+    ]
 
 # Serving media and static in debug/developer mode.
 if settings.DEBUG:
@@ -63,16 +63,16 @@ if settings.DEBUG:
 if 'feincms' in settings.INSTALLED_APPS:
     from page.models import Page
     Page
-    urlpatterns += patterns('',
+    urlpatterns += [
         url(r'^pages/', include('feincms.urls')),
-        )
+        ]
 
 # Conditionally including DjangoCMS URls in case if
 # DjangoCMS in installed apps.
 if 'cms' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('',
+    urlpatterns += [
         url(r'^cms-pages/', include('cms.urls')),
-        )
+        ]
 
 # Conditionally including Captcha URls in case if
 # Captcha in installed apps.
@@ -80,6 +80,6 @@ try:
     from captcha.fields import ReCaptchaField
 except ImportError as e:
     if 'captcha' in settings.INSTALLED_APPS:
-        urlpatterns += patterns('',
+        urlpatterns += [
             url(r'^captcha/', include('captcha.urls')),
-        )
+        ]

examples/tutorial/urls.py

@@ -22,7 +22,7 @@ fobi_home_template = fobi_theme_home_template_mapping.get(
     'home/base.html'
     )
 
-urlpatterns = patterns('',
+urlpatterns = [
     # DB Store plugin URLs
     url(r'^fobi/plugins/form-handlers/db-store/',
         include('fobi.contrib.plugins.form_handlers.db_store.urls')),
@@ -45,7 +45,7 @@ urlpatterns = patterns('',
 
     # django-fobi public forms contrib app:
     #url(r'^', include('fobi.contrib.apps.public_forms.urls')),
-)
+]
 
 # Serving media and static in debug/developer mode.
 if settings.DEBUG:
@@ -57,6 +57,6 @@ if settings.DEBUG:
 if 'feincms' in settings.INSTALLED_APPS:
     from page.models import Page
     Page
-    urlpatterns += patterns('',
+    urlpatterns += [
         url(r'', include('feincms.urls')),
-    )
+    ]

src/fobi/admin.py

@@ -9,7 +9,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.html import strip_tags
 from django.contrib.admin.views.decorators import staff_member_required
 from django.utils.decorators import method_decorator
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.shortcuts import render_to_response, redirect
 from django.template import RequestContext
 from django.contrib import messages
@@ -389,11 +389,11 @@ class FormElementAdmin(BasePluginModelAdmin):
         return 'admin:fobi_formelement_changelist'
 
     def get_urls(self):
-        my_urls = patterns('',
+        my_urls = [
             # Bulk change plugins
             url(r'^bulk-change-form-element-plugins/$', self.bulk_change_plugins,
                 name='bulk_change_form_element_plugins'),
-        )
+        ]
         return my_urls + super(FormElementAdmin, self).get_urls()
 
 
@@ -418,11 +418,11 @@ class FormHandlerAdmin(BasePluginModelAdmin):
         return 'admin:fobi_formhandler_changelist'
 
     def get_urls(self):
-        my_urls = patterns('',
+        my_urls = [
             # Bulk change plugins
             url(r'^bulk-change-form-handler-plugins/$', self.bulk_change_plugins,
                 name='bulk_change_form_handler_plugins'),
-        )
+        ]
         return my_urls + super(FormHandlerAdmin, self).get_urls()
 
 

src/fobi/contrib/plugins/form_elements/security/captcha/README.rst

@@ -28,9 +28,9 @@ Taken from django-simple-captcha `installation instructions
 
 .. code-block:: python
 
-    urlpatterns += patterns('',
+    urlpatterns += [
         url(r'^captcha/', include('captcha.urls')),
-    )
+    ]
 
 Install `fobi` Captcha plugin
 -----------------------------

src/fobi/contrib/plugins/form_handlers/db_store/README.rst

@@ -38,8 +38,8 @@ Installation
 
 .. code-block:: python
 
-    urlpatterns = patterns('',
+    urlpatterns = [
         # DB Store plugin URLs
         url(r'^fobi/plugins/form-handlers/db-store/',
             include('fobi.contrib.plugins.form_handlers.db_store.urls')),
-    )
+    ]