Skip to content

Commit 3c984a4

Browse files
committed
Update test urls and drop support for legacy Django versions
1 parent 46690a0 commit 3c984a4

File tree

2 files changed

+12
-24
lines changed

2 files changed

+12
-24
lines changed

djangosaml2/tests/urls.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,19 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

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
2116
from django.contrib import admin
22-
admin.autodiscover()
17+
18+
from djangosaml2 import views
2319

2420

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'),
3328

3429
# this is needed for the tests
3530
url(r'^admin/', include(admin.site.urls)),

djangosaml2/urls.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
# limitations under the License.
1515

1616
import django
17-
from django.conf.urls import handler500, url
17+
from django.conf.urls import url
1818
from djangosaml2 import views
1919

20+
2021
urlpatterns = [
2122
url(r'^login/$', views.login, name='saml2_login'),
2223
url(r'^acs/$', views.assertion_consumer_service, name='saml2_acs'),
@@ -25,11 +26,3 @@
2526
url(r'^ls/post/$', views.logout_service_post, name='saml2_ls_post'),
2627
url(r'^metadata/$', views.metadata, name='saml2_metadata'),
2728
]
28-
29-
if django.VERSION < (1, 8):
30-
# django.conf.urls.patterns will be removed from django 1.10, so we
31-
# import it here
32-
from django.conf.urls import patterns
33-
urlpatterns = patterns('', *urlpatterns)
34-
35-
handler500 = handler500

0 commit comments

Comments
 (0)