factorize compatibility layer (#36509)

This commit is contained in:
Benjamin Dauvergne 2019-09-29 11:20:02 +02:00
parent 453ee8a813
commit 83abc78605
5 changed files with 7 additions and 19 deletions

View File

@ -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'

View File

@ -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):

View File

@ -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'

View File

@ -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

View File

@ -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