misc: add support for new django.urls module (#36330)
This commit is contained in:
parent
1aea1cbe00
commit
785969fc11
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue