From 83abc786058a3cf2258980aaa822d12f2eaca156 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Sun, 29 Sep 2019 11:20:02 +0200
Subject: [PATCH] factorize compatibility layer (#36509)

---
 mellon/middleware.py  | 2 +-
 mellon/utils.py       | 5 +----
 mellon/views.py       | 6 +-----
 tests/test_sso_slo.py | 7 ++-----
 tests/test_views.py   | 6 ++----
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/mellon/middleware.py b/mellon/middleware.py
index bd9e82b..d834b60 100644
--- a/mellon/middleware.py
+++ b/mellon/middleware.py
@@ -17,9 +17,9 @@ from __future__ import unicode_literals
 
 from django.utils.http import urlencode
 from django.http import HttpResponseRedirect
-from django.core.urlresolvers import reverse
 
 from . import app_settings, utils
+from .compat import reverse
 
 PASSIVE_TRIED_COOKIE = 'MELLON_PASSIVE_TRIED'
 
diff --git a/mellon/utils.py b/mellon/utils.py
index b50e475..d0ddc91 100644
--- a/mellon/utils.py
+++ b/mellon/utils.py
@@ -24,10 +24,6 @@ from xml.parsers import expat
 
 import django
 from django.contrib import auth
-if django.VERSION < (1, 11, 0):
-    from django.core.urlresolvers import reverse
-else:
-    from django.urls import reverse
 from django.template.loader import render_to_string
 from django.utils.timezone import make_aware, now, make_naive, is_aware, get_default_timezone
 from django.conf import settings
@@ -35,6 +31,7 @@ from django.utils.six.moves.urllib.parse import urlparse
 import lasso
 
 from . import app_settings
+from .compat import reverse
 
 
 def create_metadata(request):
diff --git a/mellon/views.py b/mellon/views.py
index 29b2ca9..1d8d08b 100644
--- a/mellon/views.py
+++ b/mellon/views.py
@@ -24,11 +24,6 @@ from xml.sax.saxutils import escape
 import xml.etree.ElementTree as ET
 
 
-import django
-if django.VERSION < (1, 11, 0):
-    from django.core.urlresolvers import reverse
-else:
-    from django.urls import reverse
 from django.views.generic import View
 from django.http import HttpResponseBadRequest, HttpResponseRedirect, HttpResponse
 from django.contrib import auth
@@ -43,6 +38,7 @@ from django.db import transaction
 from django.utils.translation import ugettext as _
 
 from . import app_settings, utils
+from .compat import reverse
 
 RETRY_LOGIN_COOKIE = 'MELLON_RETRY_LOGIN'
 
diff --git a/tests/test_sso_slo.py b/tests/test_sso_slo.py
index 578b5c7..2e68b37 100644
--- a/tests/test_sso_slo.py
+++ b/tests/test_sso_slo.py
@@ -25,11 +25,6 @@ import lasso
 
 from pytest import fixture
 
-import django
-if django.VERSION >= (1, 11, 0):
-    from django.urls import reverse
-else:
-    from django.core.urlresolvers import reverse
 from django.utils import six
 from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.encoding import force_str
@@ -38,6 +33,8 @@ from mellon.utils import create_metadata
 
 from httmock import all_requests, HTTMock, response as mock_response
 
+from mellon.compat import reverse
+
 from utils import reset_caplog
 
 
diff --git a/tests/test_views.py b/tests/test_views.py
index bf66855..245e58c 100644
--- a/tests/test_views.py
+++ b/tests/test_views.py
@@ -25,15 +25,13 @@ import hashlib
 from httmock import HTTMock
 
 import django
-if django.VERSION >= (1, 11, 0):
-    from django.urls import reverse
-else:
-    from django.core.urlresolvers import reverse
 from django.utils.encoding import force_text
 from django.utils.http import urlencode
 
 from xml_utils import assert_xml_constraints
 
+from mellon.compat import reverse
+
 from utils import error_500, html_response
 
 pytestmark = pytest.mark.django_db