|
2 | 2 | import re |
3 | 3 | from importlib import import_module |
4 | 4 |
|
5 | | -import django |
6 | 5 | from django import forms |
7 | 6 | from django.contrib.contenttypes.models import ContentType |
8 | 7 | from django.core.exceptions import ImproperlyConfigured |
9 | 8 | from django.db import DatabaseError |
10 | 9 | from django.template.response import TemplateResponse |
| 10 | +from django.urls import URLResolver |
| 11 | +from django.urls.resolvers import RegexPattern |
11 | 12 | from django.utils.functional import SimpleLazyObject |
12 | 13 |
|
13 | 14 | from fluent_pages import appsettings |
14 | 15 | from fluent_pages.adminui import PageAdmin |
15 | 16 |
|
16 | | -try: |
17 | | - from django.urls import URLResolver # Django 2.0+ |
18 | | - from django.urls.resolvers import RegexPattern |
19 | | -except ImportError: |
20 | | - try: |
21 | | - from django.urls import RegexURLResolver as URLResolver # Django 1.11 |
22 | | - except ImportError: |
23 | | - from django.core.urlresolvers import ( |
24 | | - RegexURLResolver as URLResolver, # Django 1.10 / 1.11 with deprecation warning |
25 | | - ) |
26 | | - |
27 | 17 | __all__ = ("PageTypePlugin",) |
28 | 18 |
|
29 | 19 |
|
@@ -227,8 +217,5 @@ def get_url_resolver(self): |
227 | 217 | ) |
228 | 218 | ) |
229 | 219 |
|
230 | | - if django.VERSION > (2, 0): |
231 | | - self._url_resolver = URLResolver(RegexPattern(r"^/"), patterns) |
232 | | - else: |
233 | | - self._url_resolver = URLResolver(r"^/", patterns) |
| 220 | + self._url_resolver = URLResolver(RegexPattern(r"^/"), patterns) |
234 | 221 | return self._url_resolver |
0 commit comments