diff options
| author | Rob Cresswell <robert.cresswell@outlook.com> | 2016-02-15 15:55:51 +0000 |
|---|---|---|
| committer | Rob Cresswell <robert.cresswell@outlook.com> | 2016-02-16 19:41:52 +0000 |
| commit | d3bca7a8fb397cab882372a0cac354cf32306e5c (patch) | |
| tree | da21512b4a1ec8397a223321a6a8c0074f18f9ee | |
| parent | 34478aa88bfac3fe4449a4e080dfe343db37e7f6 (diff) | |
| download | django_openstack_auth-d3bca7a8fb397cab882372a0cac354cf32306e5c.tar.gz | |
Update URLs to Django 1.8+ style
Django 1.8 altered and deprecated the existing pattern for defining
URLs. This will be removed in 1.10, meaning that many deprecation
warnings show up under Django 1.9. We should fix the URLs promptly to
avoid logspam, and to support Django 1.10 in Newton.
See
https://docs.djangoproject.com/en/1.9/releases/1.8/#django-conf-urls-patterns
Change-Id: Ieea8e1058c833be07c57e5949d4c5f614359a1ea
Partially-Implements: blueprint dj110
| -rw-r--r-- | openstack_auth/tests/urls.py | 9 | ||||
| -rw-r--r-- | openstack_auth/urls.py | 22 |
2 files changed, 14 insertions, 17 deletions
diff --git a/openstack_auth/tests/urls.py b/openstack_auth/tests/urls.py index 4c9045d..b93725a 100644 --- a/openstack_auth/tests/urls.py +++ b/openstack_auth/tests/urls.py @@ -12,19 +12,18 @@ # limitations under the License. from django.conf.urls import include -from django.conf.urls import patterns from django.conf.urls import url from django.views import generic from openstack_auth import utils +from openstack_auth import views utils.patch_middleware_get_user() -urlpatterns = patterns( - '', +urlpatterns = [ url(r"", include('openstack_auth.urls')), - url(r"^websso/$", "openstack_auth.views.websso", name='websso'), + url(r"^websso/$", views.websso, name='websso'), url(r"^$", generic.TemplateView.as_view(template_name="auth/blank.html")) -) +] diff --git a/openstack_auth/urls.py b/openstack_auth/urls.py index db11f47..a7d9dac 100644 --- a/openstack_auth/urls.py +++ b/openstack_auth/urls.py @@ -11,25 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import patterns from django.conf.urls import url from openstack_auth import utils +from openstack_auth import views utils.patch_middleware_get_user() -urlpatterns = patterns( - 'openstack_auth.views', - url(r"^login/$", "login", name='login'), - url(r"^logout/$", 'logout', name='logout'), - url(r'^switch/(?P<tenant_id>[^/]+)/$', 'switch', name='switch_tenants'), - url(r'^switch_services_region/(?P<region_name>[^/]+)/$', 'switch_region', +urlpatterns = [ + url(r"^login/$", views.login, name='login'), + url(r"^logout/$", views.logout, name='logout'), + url(r'^switch/(?P<tenant_id>[^/]+)/$', views.switch, + name='switch_tenants'), + url(r'^switch_services_region/(?P<region_name>[^/]+)/$', + views.switch_region, name='switch_services_region') -) +] if utils.is_websso_enabled(): - urlpatterns += patterns( - 'openstack_auth.views', - url(r"^websso/$", "websso", name='websso') - ) + urlpatterns.append(url(r"^websso/$", views.websso, name='websso')) |