Merge pull request #2574 from pallets-eco/fix/packaging-wtforms

Don't use packaging for wtforms version check
pallets-eco · Nov 22, 2024 · 5caec1e · 5caec1e
2 parents aad1b87 + 4d20a8d
commit 5caec1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -7,6 +7,7 @@ Changelog
 Fixes:
 
 * Jinja templates can now be loaded in StrictUndefined mode.
+* Remove an implicit dependency on `packaging`
 
 2.0.0a2
 -------

diff --git a/flask_admin/_compat.py b/flask_admin/_compat.py
@@ -46,12 +46,11 @@ def _iter_choices_wtforms_compat(val, label, selected):
 
     https://wtforms.readthedocs.io/en/3.2.x/changes/#version-3-2-0
     """
-    from packaging.version import Version
     import wtforms
 
-    wtforms_version = Version(wtforms.__version__)
+    wtforms_version = tuple(int(part) for part in wtforms.__version__.split(".")[:2])
 
-    if wtforms_version >= Version("3.2.0"):
+    if wtforms_version >= (3, 2):
         return val, label, selected, {}
 
     return val, label, selected
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ Changelog @@
     Fixes:
     * Jinja templates can now be loaded in StrictUndefined mode.
+    * Remove an implicit dependency on `packaging`
 .0.0a2
     -------
@@ Expand Down @@