- remove BBB for Zope versions we do not support anymore

zopefoundation · May 19, 2017 · 3c8a3dc · 3c8a3dc
1 parent e2dd454
commit 3c8a3dc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 42 deletions.
diff --git a/src/five/localsitemanager/__init__.py b/src/five/localsitemanager/__init__.py
@@ -16,15 +16,10 @@
 from Acquisition import aq_base
 from zope.component.globalregistry import base
 from zope.component.interfaces import ComponentLookupError
-try:
-    from zope.component.interfaces import ISite
-except ImportError:
-    # BBB: for Zope < 2.13 (zope.component < 3.8)
-    from zope.location.interfaces import ISite
+from zope.component.interfaces import ISite
 
 from five.localsitemanager.registry import PersistentComponents
 from five.localsitemanager.utils import get_parent
-# BBB: for Zope < 2.13 this has to be imported at the end
 from Products.Five.component import enableSite
 from Products.Five.component.interfaces import IObjectManagerSite
 

diff --git a/src/five/localsitemanager/browser.py b/src/five/localsitemanager/browser.py
@@ -15,11 +15,7 @@
 
 from Products.Five.component.browser import ObjectManagerSiteView
 from zope.component.globalregistry import base
-try:
-    from zope.component.hooks import setSite
-except ImportError:
-    # BBB: for Zope < 2.13 (zope.component < 3.8)
-    from zope.site.hooks import setSite
+from zope.component.hooks import setSite
 
 from five.localsitemanager import make_objectmanager_site
 

diff --git a/src/five/localsitemanager/browser.txt b/src/five/localsitemanager/browser.txt
@@ -14,24 +14,15 @@ Load all of Five's configuration (this is a functional test):
 
     >>> import Products.Five
     >>> import five.localsitemanager
-
-    # BBB: for Zope < 2.13
-    >>> try:
-    ...     from Zope2.App.zcml import load_config, load_string
-    ... except ImportError:
-    ...     from Products.Five.zcml import load_config, load_string
+    >>> from Zope2.App.zcml import load_config, load_string
 
     >>> load_config('configure.zcml', package=Products.Five)
     >>> load_config('configure.zcml', package=five.localsitemanager)
     >>> load_string('<includeOverrides package="five.localsitemanager" file="overrides.zcml" />')
 
 Enable local component lookup hooks:
 
-    # BBB: for Zope < 2.13 (zope.component < 3.8)
-    >>> try:
-    ...     from zope.component.hooks import setHooks
-    ... except ImportError:
-    ...     from zope.site.hooks import setHooks
+    >>> from zope.component.hooks import setHooks
     >>> setHooks()
 
 User Set Up
@@ -42,12 +33,7 @@ User Set Up
 
 Create the test browser we'll be using:
 
-    # BBB: for Zope < 2.13
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
-
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.addHeader('Authorization', 'Basic admin:admin')
 

diff --git a/src/five/localsitemanager/localsitemanager.txt b/src/five/localsitemanager/localsitemanager.txt
@@ -11,13 +11,8 @@ We start from an empty folder. Since ``OFS.Folder``'s extend
 
 Of course we now need to transform that IPossibleSite into a real ISite.
 
-    # BBB: for Zope < 2.13 (zope.component < 3.8)
-    >>> try:
-    ...     from zope.component.hooks import setHooks
-    ...     from zope.component.hooks import setSite
-    ... except ImportError:
-    ...     from zope.site.hooks import setHooks
-    ...     from zope.site.hooks import setSite
+    >>> from zope.site.hooks import setHooks
+    >>> from zope.site.hooks import setSite
     >>> setHooks()
 
     >>> from five.localsitemanager import make_objectmanager_site

diff --git a/src/five/localsitemanager/registry.py b/src/five/localsitemanager/registry.py
@@ -13,19 +13,16 @@
 """Component registry for local site manager.
 """
 
+import six
+
 import Acquisition
 import persistent
 import zope.component.interfaces
 import zope.event
 from Acquisition.interfaces import IAcquirer
 from OFS.ObjectManager import ObjectManager
-try:
-    from zope.component.hooks import getSite
-    from zope.component.interfaces import ISite
-except ImportError:
-    # BBB: for Zope < 2.13 (zope.component < 3.8)
-    from zope.location.interfaces import ISite
-    from zope.site.hooks import getSite
+from zope.component.hooks import getSite
+from zope.component.interfaces import ISite
 from zope.component.persistentregistry import PersistentComponents
 from zope.component.registry import _getUtilityProvided
 from zope.component.registry import UtilityRegistration