Use plone.app.z3cform.widgets.OrderedSelect in Plone 6.1

collective · Jan 13, 2025 · 317e00c · 317e00c
1 parent e2831f1
commit 317e00c
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 269 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,7 +14,8 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- Use `plone.app.z3cform.widgets.OrderedSelect` in Plone 6.1
+  [petschki]
 
 
 3.1.5 (2024-11-05)

diff --git a/src/collective/taxonomy/widget.py b/src/collective/taxonomy/widget.py
@@ -1,14 +1,20 @@
 from collective.taxonomy.interfaces import ITaxonomySelectWidget
 from plone.memoize import ram
 from z3c.form import interfaces
-from z3c.form.browser.orderedselect import OrderedSelectWidget
 from z3c.form.widget import FieldWidget
 
 import zope.component
 import zope.interface
 import zope.schema.interfaces
 
 
+try:
+    # Plone 6.1
+    from plone.app.z3cform.widgets.orderedselect import OrderedSelectWidget
+except ImportError:
+    from z3c.form.browser.orderedselect import OrderedSelectWidget
+
+
 def _items_cachekey(fun, self):
     # try to get modified time of taxonomy utility
     try: