diff options
| -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')) |