Skip to content

Commit f6a380d

Browse files
committed
Remove compatibility code for django-any-urlfield < 2.0
That version supports Django 1.7, and the current 2.7.post1 doesn't pass StrictVersion checks.
1 parent b082477 commit f6a380d

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

fluent_pages/models/__init__.py

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,15 @@
4242

4343
def _register_cmsfield_url_type():
4444
try:
45+
from any_urlfield.forms.widgets import SimpleRawIdWidget
4546
from any_urlfield.models import AnyUrlField
4647
except ImportError:
4748
pass
4849
else:
49-
from distutils.version import StrictVersion
50-
51-
import any_urlfield
52-
from any_urlfield.forms.widgets import SimpleRawIdWidget
53-
54-
if StrictVersion(any_urlfield.__version__) >= StrictVersion("2.0a1"):
55-
# Allow lambda parameter for late evaluation.
56-
AnyUrlField.register_model(
57-
Page, form_field=lambda: PageChoiceField(widget=SimpleRawIdWidget(Page))
58-
)
59-
else:
60-
# This will run a query at import time!
61-
AnyUrlField.register_model(
62-
Page, form_field=PageChoiceField(widget=SimpleRawIdWidget(Page))
63-
)
50+
# Allow lambda parameter for late evaluation.
51+
AnyUrlField.register_model(
52+
Page, form_field=lambda: PageChoiceField(widget=SimpleRawIdWidget(Page))
53+
)
6454

6555

6656
if "any_urlfield" in settings.INSTALLED_APPS:

0 commit comments

Comments
 (0)