Skip to content

Commit 789af7b

Browse files
committed
Remove old Django 1.11 compatibility code
1 parent f6a380d commit 789af7b

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed

fluent_pages/extensions/pagetypebase.py

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,18 @@
22
import re
33
from importlib import import_module
44

5-
import django
65
from django import forms
76
from django.contrib.contenttypes.models import ContentType
87
from django.core.exceptions import ImproperlyConfigured
98
from django.db import DatabaseError
109
from django.template.response import TemplateResponse
10+
from django.urls import URLResolver
11+
from django.urls.resolvers import RegexPattern
1112
from django.utils.functional import SimpleLazyObject
1213

1314
from fluent_pages import appsettings
1415
from fluent_pages.adminui import PageAdmin
1516

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-
2717
__all__ = ("PageTypePlugin",)
2818

2919

@@ -227,8 +217,5 @@ def get_url_resolver(self):
227217
)
228218
)
229219

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)
234221
return self._url_resolver

0 commit comments

Comments
 (0)