r252683 - Products.PloneTemplates/trunk/Products/PloneTemplates/browser
"Dylan Jay" <svn-changes-z4DKO/[email protected]> Tue, 5 Nov 2013 05:55:11 +0000 (UTC)
| Newsgroups | gmane.comp.web.zope.plone.collective.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: djay Date: Tue Nov 5 05:55:11 2013 New Revision: 252683 Modified: Products.PloneTemplates/trunk/Products/PloneTemplates/browser/menu.py Log: fix 4.3 compat Modified: Products.PloneTemplates/trunk/Products/PloneTemplates/browser/menu.py ============================================================================== --- Products.PloneTemplates/trunk/Products/PloneTemplates/browser/menu.py (original) +++ Products.PloneTemplates/trunk/Products/PloneTemplates/browser/menu.py Tue Nov 5 05:55:11 2013 @@ -1,7 +1,14 @@ from Acquisition import aq_inner from zope.component import getMultiAdapter -from zope.app.publisher.browser.menu import BrowserMenu -from zope.app.publisher.browser.menu import BrowserSubMenuItem +try: + # Plone < 4.3 + from zope.app.publisher.browser.menu import BrowserMenu + from zope.app.publisher.browser.menu import BrowserSubMenuItem +except ImportError: + # Plone >= 4.3 + # zope.app.publisher Refactor package, spliting it to several new packages + from zope.browsermenu.menu import BrowserMenu + from zope.browsermenu.menu import BrowserSubMenuItem from Products.CMFCore.utils import getToolByName from Products.PloneTemplates import MessageFactory as _ from plone.memoize.instance import memoize ------------------------------------------------------------------------------ November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk