Changeset 2124 in products

Timestamp:

Apr 14, 2010 12:51:20 PM (14 years ago)

Author:

mylan

Message:

#146: Fix browserlayer operations for Plone < 3.1.1

Location:

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer

Files:

• config.py (modified) (1 diff)
• setuphandlers.py (modified) (2 diffs)
• tests/base.py (modified) (1 diff)
• tests/testInstallation.py (modified) (2 diffs)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/config.py

@@ -1 +1 @@
 PROJECT_NAME = 'quintagroup.seoptimizer'
+
+SUPPORT_BLAYER = True
+try:
+    from plone import browserlayer
+except ImportError:
+    SUPPORT_BLAYER = False

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/setuphandlers.py

@@ -2 +2 @@
 
 from zope.component import getSiteManager
-from plone.browserlayer.utils import unregister_layer
-from plone.browserlayer.interfaces import ILocalBrowserLayerType
 
+from config import SUPPORT_BLAYER
+    
 from Products.CMFCore.utils import getToolByName
 
@@ -32 +32 @@
     """ Remove browser layer.
     """
+    if not SUPPORT_BLAYER:
+        return
+
+    from plone.browserlayer.utils import unregister_layer
+    from plone.browserlayer.interfaces import ILocalBrowserLayerType
+
     name="qSEOptimizer"
     site = getSiteManager(site)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/base.py

@@ -34 +34 @@
 
 from quintagroup.seoptimizer.config import PROJECT_NAME
+from quintagroup.seoptimizer.config import SUPPORT_BLAYER
 
 ptc.setupPloneSite()

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/testInstallation.py

@@ -84 +84 @@
 
     def test_browser_layer(self):
+        if not SUPPORT_BLAYER:
+            return
+
         from plone.browserlayer import utils
         self.assert_(IPloneSEOLayer in utils.registered_layers(),
@@ -125 +128 @@
 
     def test_browserlayer_uninstall(self):
+        if not SUPPORT_BLAYER:
+            return
+
         from plone.browserlayer import utils
         self.assertEqual(IPloneSEOLayer in utils.registered_layers(), False,