From 81675207d3d34098e9e7e4d7c431e838a911535a Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Wed, 23 Jun 2021 08:46:45 +0200 Subject: [PATCH] rm urlresolvers compat has been removed in django 2.0 https://docs.djangoproject.com/en/1.10/internals/deprecation/#deprecation-removed-in-2-0 --- mfa/Common.py | 6 +----- mfa/Email.py | 6 +----- mfa/middleware.py | 2 +- mfa/views.py | 6 +----- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/mfa/Common.py b/mfa/Common.py index 7d45373..07575b1 100644 --- a/mfa/Common.py +++ b/mfa/Common.py @@ -1,10 +1,6 @@ from django.conf import settings from django.core.mail import EmailMessage - -try: - from django.urls import reverse -except: - from django.core.urlresolver import reverse +from django.urls import reverse def send(to, subject, body): diff --git a/mfa/Email.py b/mfa/Email.py index e7f055f..c337009 100644 --- a/mfa/Email.py +++ b/mfa/Email.py @@ -7,14 +7,10 @@ from django.contrib.auth import get_user_model from django.http import HttpResponseRedirect from django.shortcuts import render from django.template.context_processors import csrf +from django.urls import reverse from django.utils import timezone from django.views.decorators.cache import never_cache -try: - from django.core.urlresolvers import reverse -except: - from django.urls import reverse - from .Common import send from .models import User_Keys from .views import login diff --git a/mfa/middleware.py b/mfa/middleware.py index d61e956..818222e 100644 --- a/mfa/middleware.py +++ b/mfa/middleware.py @@ -1,8 +1,8 @@ import time from django.conf import settings -from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect +from django.urls import reverse def process(request): diff --git a/mfa/views.py b/mfa/views.py index 7827adf..d9d9fbd 100644 --- a/mfa/views.py +++ b/mfa/views.py @@ -4,13 +4,9 @@ from django.conf import settings from django.contrib.auth.decorators import login_required from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render +from django.urls import reverse from user_agents import parse -try: - from django.urls import reverse -except: - from django.core.urlresolvers import reverse - from . import TrustedDevice from .models import User_Keys