|
12 | 12 | # See the License for the specific language governing permissions and
|
13 | 13 | # limitations under the License.
|
14 | 14 |
|
15 |
| -try: |
16 |
| - from django.conf.urls import patterns, include, url |
17 |
| -# Fallback for Django versions < 1.4 |
18 |
| -except ImportError: |
19 |
| - from django.conf.urls.defaults import patterns, include, url |
20 |
| - |
| 15 | +from django.conf.urls import patterns, include, url |
21 | 16 | from django.contrib import admin
|
22 |
| -admin.autodiscover() |
| 17 | + |
| 18 | +from djangosaml2 import views |
23 | 19 |
|
24 | 20 |
|
25 |
| -urlpatterns = patterns( |
26 |
| - 'djangosaml2.views', |
27 |
| - url(r'^login/$', 'login', name='saml2_login'), |
28 |
| - url(r'^acs/$', 'assertion_consumer_service', name='saml2_acs'), |
29 |
| - url(r'^logout/$', 'logout', name='saml2_logout'), |
30 |
| - url(r'^ls/$', 'logout_service', name='saml2_ls'), |
31 |
| - url(r'^ls/post/$', 'logout_service_post', name='saml2_ls_post'), |
32 |
| - url(r'^metadata/$', 'metadata', name='saml2_metadata'), |
| 21 | +urlpatterns = patterns('' |
| 22 | + url(r'^login/$', views.login, name='saml2_login'), |
| 23 | + url(r'^acs/$', views.assertion_consumer_service, name='saml2_acs'), |
| 24 | + url(r'^logout/$', views.logout, name='saml2_logout'), |
| 25 | + url(r'^ls/$', views.logout_service, name='saml2_ls'), |
| 26 | + url(r'^ls/post/$', views.logout_service_post, name='saml2_ls_post'), |
| 27 | + url(r'^metadata/$', views.metadata, name='saml2_metadata'), |
33 | 28 |
|
34 | 29 | # this is needed for the tests
|
35 | 30 | url(r'^admin/', include(admin.site.urls)),
|
|
0 commit comments