From 785969fc11244832b60b42e6addf5fabdce1b4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 21 Sep 2019 21:14:29 +0200 Subject: [PATCH] misc: add support for new django.urls module (#36330) --- mellon/utils.py | 6 +++++- mellon/views.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mellon/utils.py b/mellon/utils.py index e7fe49e..5bbd726 100644 --- a/mellon/utils.py +++ b/mellon/utils.py @@ -22,8 +22,12 @@ from functools import wraps import isodate from xml.parsers import expat +import django from django.contrib import auth -from django.core.urlresolvers import reverse +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 diff --git a/mellon/views.py b/mellon/views.py index 6228a93..29b2ca9 100644 --- a/mellon/views.py +++ b/mellon/views.py @@ -24,7 +24,11 @@ from xml.sax.saxutils import escape import xml.etree.ElementTree as ET -from django.core.urlresolvers import reverse +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