diff --git a/helios/security.py b/helios/security.py index 0e1861dcabfcdeb01f3d9e8f122e08f6914429a3..116c013cbb80ddfd724a9ed70c4fef79dc856d8b 100644 --- a/helios/security.py +++ b/helios/security.py @@ -7,7 +7,7 @@ Ben Adida (ben@adida.net) # nicely update the wrapper function from functools import update_wrapper -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.exceptions import PermissionDenied from django.http import Http404 from django.conf import settings diff --git a/helios/stats_views.py b/helios/stats_views.py index 9d19dd69fca43f38f149e23fb7fc411d6f9c5137..5e71a32e8dca7cf20a191aeffe9cc8dc5bda3492 100644 --- a/helios/stats_views.py +++ b/helios/stats_views.py @@ -5,7 +5,7 @@ Helios stats views import datetime from django.core.paginator import Paginator -from django.core.urlresolvers import reverse +from django.urls import reverse from django.db.models import Max, Count from django.http import HttpResponseRedirect diff --git a/helios/views.py b/helios/views.py index 4234c6e559511afc6c9badf964852d9b1ec52c91..72ae93f5106cd9652b5498356e0587bdd3b74bbb 100644 --- a/helios/views.py +++ b/helios/views.py @@ -5,7 +5,7 @@ Helios Django Views Ben Adida (ben@adida.net) """ -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.paginator import Paginator from django.core.exceptions import PermissionDenied from django.http import HttpResponse, Http404, HttpResponseRedirect, HttpResponseForbidden diff --git a/helios_auth/auth_systems/cas.py b/helios_auth/auth_systems/cas.py index cb10fac0a201e93eda7b29ec0a5073348733c772..dd4216b5ecc2c3953892332fa49ae8a51b13eeff 100644 --- a/helios_auth/auth_systems/cas.py +++ b/helios_auth/auth_systems/cas.py @@ -36,7 +36,7 @@ def _get_service_url(): # FIXME current URL from helios_auth import url_names from django.conf import settings - from django.core.urlresolvers import reverse + from django.urls import reverse return settings.SECURE_URL_HOST + reverse(url_names.AUTH_AFTER) diff --git a/helios_auth/auth_systems/linkedin.py b/helios_auth/auth_systems/linkedin.py index 32b0033c14fc0c3277671470055d91dbd1271556..696eda9836f0c141360d24f00739d8ed66fca95e 100644 --- a/helios_auth/auth_systems/linkedin.py +++ b/helios_auth/auth_systems/linkedin.py @@ -4,7 +4,7 @@ LinkedIn Authentication from oauthclient import client -from django.core.urlresolvers import reverse +from django.urls import reverse from django.http import HttpResponseRedirect from helios_auth import utils diff --git a/helios_auth/auth_systems/openid/util.py b/helios_auth/auth_systems/openid/util.py index 277b92ca18f21b5c9f465701217fe82fdea94c28..1ed33f3be0f82de0f2f9d545a79ccf8b972bd878 100644 --- a/helios_auth/auth_systems/openid/util.py +++ b/helios_auth/auth_systems/openid/util.py @@ -10,7 +10,7 @@ from django.template.context import RequestContext from django.template import loader from django import http from django.core.exceptions import ImproperlyConfigured -from django.core.urlresolvers import reverse as reverseURL +from django.urls import reverse as reverseURL from django.conf import settings diff --git a/helios_auth/auth_systems/password.py b/helios_auth/auth_systems/password.py index 6204f1d4a88c67e8a402ae242c560ae4c0bdcb70..aadb03fb05e52d9bbe4e9b2d5e8e02933b89590f 100644 --- a/helios_auth/auth_systems/password.py +++ b/helios_auth/auth_systems/password.py @@ -2,7 +2,7 @@ Username/Password Authentication """ -from django.core.urlresolvers import reverse +from django.urls import reverse from django import forms from django.core.mail import send_mail from django.conf import settings diff --git a/helios_auth/auth_systems/twitter.py b/helios_auth/auth_systems/twitter.py index b59cd38fd8f94480f2730221cb6fcbfda6f28291..8739d607ebcb1d85b0b539c8f85eb34cceaa4ce8 100644 --- a/helios_auth/auth_systems/twitter.py +++ b/helios_auth/auth_systems/twitter.py @@ -5,7 +5,7 @@ Twitter Authentication from oauthclient import client from django.conf.urls import url -from django.core.urlresolvers import reverse +from django.urls import reverse from django.http import HttpResponseRedirect from helios_auth import utils diff --git a/helios_auth/tests.py b/helios_auth/tests.py index 824dc535183e9b8f1483a2ffc9d9897212353b44..de21e3b09c600084194a47bd5cd0f73522a74daa 100644 --- a/helios_auth/tests.py +++ b/helios_auth/tests.py @@ -91,7 +91,7 @@ class UserModelTests(unittest.TestCase): import views import auth_systems.password as password_views -from django.core.urlresolvers import reverse +from django.urls import reverse # FIXME: login CSRF should make these tests more complicated # and should be tested for diff --git a/helios_auth/views.py b/helios_auth/views.py index 27614478c8e827b06426b0f28c40ed5345839b27..f246dafd582ef696d6ba2351fad93d507f7924eb 100644 --- a/helios_auth/views.py +++ b/helios_auth/views.py @@ -6,7 +6,7 @@ Ben Adida """ import urllib -from django.core.urlresolvers import reverse +from django.urls import reverse from django.http import HttpResponseRedirect, HttpResponse import helios_auth