[Checkins] SVN: five.formlib/trunk/ Deal with backwards compatibility for the menuItemDirective.

[Hanno Schlichting]

Log message for revision 107341:
  Deal with backwards compatibility for the menuItemDirective.
  

Changed:
  U   five.formlib/trunk/CHANGES.txt
  U   five.formlib/trunk/setup.py
  U   five.formlib/trunk/src/five/formlib/metaconfigure.py

-=-
Modified: five.formlib/trunk/CHANGES.txt
===================================================================
--- five.formlib/trunk/CHANGES.txt	2009-12-30 02:08:13 UTC (rev 107340)
+++ five.formlib/trunk/CHANGES.txt	2009-12-30 02:11:30 UTC (rev 107341)
@@ -4,6 +4,7 @@
 1.0.2 - unreleased
 ------------------
 
+* Deal with backwards compatibility for the menuItemDirective.
 
 1.0.1 - 2009-12-29
 ------------------

Modified: five.formlib/trunk/setup.py
===================================================================
--- five.formlib/trunk/setup.py	2009-12-30 02:08:13 UTC (rev 107340)
+++ five.formlib/trunk/setup.py	2009-12-30 02:11:30 UTC (rev 107341)
@@ -29,7 +29,6 @@
         'transaction',
         'zope.app.form',
         'zope.browser',
-        'zope.browsermenu',
         'zope.component',
         'zope.event',
         'zope.formlib',
@@ -41,6 +40,9 @@
         'zope.schema',
         'ExtensionClass',
         'Zope2',
+        # Either one of these, we rely on Zope2 to provide the correct one
+        # 'zope.browsermenu',
+        # 'zope.app.publisher',
       ],
       zip_safe = False,
       )

Modified: five.formlib/trunk/src/five/formlib/metaconfigure.py
===================================================================
--- five.formlib/trunk/src/five/formlib/metaconfigure.py	2009-12-30 02:08:13 UTC (rev 107340)
+++ five.formlib/trunk/src/five/formlib/metaconfigure.py	2009-12-30 02:11:30 UTC (rev 107341)
@@ -23,21 +23,29 @@
 from zope.i18nmessageid import MessageFactory
 _ = MessageFactory('zope')
 
-from zope.browsermenu.metaconfigure import menuItemDirective
+# BBB Zope 2.12
+try:
+    from zope.browsermenu.metaconfigure import menuItemDirective
+except ImportError:
+    from zope.app.publisher.browser.menumeta import menuItemDirective
+
 from zope.app.form.browser.metaconfigure import BaseFormDirective
 from zope.browser.interfaces import IAdding
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+
 # BBB Zope 2.12
 try:
     from AccessControl.security import protectClass
 except ImportError:
     from Products.Five.security import protectClass
 
-from five.formlib import EditView, AddView
 from Products.Five.metaclass import makeClass
 from Products.Five.browser.pagetemplatefile import ZopeTwoPageTemplateFile
 from Products.Five.browser.metaconfigure import makeClassForTemplate
 
+from five.formlib import EditView, AddView
+
+
 def EditViewFactory(name, schema, label, permission, layer,
                     template, default_template, bases, for_, fields,
                     fulledit_path=None, fulledit_label=None, menu=u''):