Merge pull request #49 from plone/select-widget-items-callable-master

In select widget, accept items as property or method.

CHANGES.rst

@@ -14,7 +14,10 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- In select widget, accept items as property or method.
+  This avoids breaking on some z3c.form versions.
+  See https://github.com/zopefoundation/z3c.form/issues/44
+  [maurits]
 
 
 2.1.1 (2016-09-16)
@@ -75,7 +78,7 @@ Fixes:
 - Reduce dependency on plone.app.widgets in tests.
   [thet]
 
-- Enhance test in order to show problem in RelatedItemsWidget with 
+- Enhance test in order to show problem in RelatedItemsWidget with
   navigation-roots
   [jensens]
 

plone/app/z3cform/widget.py

@@ -270,8 +270,16 @@ def _base_args(self):
         if not self.required:
             options['allowClear'] = True
 
+        base_items = self.items
+        if callable(base_items):
+            # items used to be a property in all widgets, then in the select
+            # widget it became a method, then in a few others too, but never in
+            # all, so this was reverted to let it be a property again.  Let's
+            # support both here to avoid breaking on some z3c.form versions.
+            # See https://github.com/zopefoundation/z3c.form/issues/44
+            base_items = base_items()
         items = []
-        for item in self.items():
+        for item in base_items:
             if not isinstance(item['content'], basestring):
                 item['content'] = translate(
                     item['content'],