Changeset 3563 in products

Timestamp:

Sep 24, 2012 11:24:32 AM (12 years ago)

Author:

potar

Message:

added compatibility with Plone 4.3; added utils for work with viewlets

Location:

quintagroup.plonetabs/trunk/quintagroup/plonetabs

Files:

• browser/plonetabs.py (modified) (3 diffs)
• tests/test_erase.py (modified) (1 diff)
• utils.py (added)

quintagroup.plonetabs/trunk/quintagroup/plonetabs/browser/plonetabs.py

@@ -7 +7 @@
 from zope.interface import implements
 from zope.component import getMultiAdapter
-from zope.app.container.interfaces import INameChooser
+
+# BBB: compatibility with older plone versions
+try:
+     # Plone < 4.3
+     from zope.app.container import interfaces
+     INameChooser = interfaces.INameChooser
+except ImportError:
+     # Plone >= 4.3 
+     from zope.container.interfaces import INameChooser
+     
 from zope.viewlet.interfaces import IViewletManager, IViewlet
 
@@ -25 +34 @@
 
 from quintagroup.plonetabs.config import PROPERTY_SHEET, FIELD_NAME
+from quintagroup.plonetabs.utils import setupViewletByName
 from quintagroup.plonetabs import messageFactory as _
 from interfaces import IPloneTabsControlPanel
@@ -444 +454 @@
     def selected_portal_tab(self):
         """See global-sections viewlet"""
-        selectedTabs = self.context.restrictedTraverse('selectedTabs')
-        selected_tabs = selectedTabs('index_html', self.context,
-            self.portal_tabs())
+        # BBB: compatibility with older plone versions.
+        # ``selectedTabs`` Python script was merged into the 
+        # GlobalSectionsViewlet.
+        section_viewlet = setupViewletByName(self,
+                                             self.context,
+                                             self.request,
+                                             'plone.global_sections')
+        if section_viewlet:
+            # Plone >= 4.3
+            selected_tabs = section_viewlet.selectedTabs(
+                default_tab='index_html', 
+                portal_tabs=self.portal_tabs())
+        else:
+            # Plone < 4.3
+            selectedTabs = self.context.restrictedTraverse('selectedTabs')
+            selected_tabs = selectedTabs('index_html', self.context,
+                self.portal_tabs())
 
         return selected_tabs['portal']

quintagroup.plonetabs/trunk/quintagroup/plonetabs/tests/test_erase.py

@@ -6 +6 @@
 from Testing import ZopeTestCase as ztc
 
-from zope.app.component.hooks import setHooks, setSite
+# BBB: compatibility with older plone versions
+try:
+    # Plone < 4.3
+    from zope.app.component import hooks 
+    setSite = hooks.setSite
+    setHooks = hooks.setHooks
+except ImportError:
+    # Plone >= 4.3 
+    from zope.component.hooks import setSite, setHooks
 
 from plone.browserlayer.utils import registered_layers