[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/ - removed obsolete BBB code
Yvo Schubbe
y.2010 at wcm-solutions.de
Mon Feb 1 05:51:10 EST 2010
Log message for revision 108683:
- removed obsolete BBB code
- removed unused variables
Changed:
U Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
U Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/configure.zcml
U Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/exportimport.py
U Products.GenericSetup/trunk/Products/GenericSetup/components.py
U Products.GenericSetup/trunk/Products/GenericSetup/context.py
U Products.GenericSetup/trunk/Products/GenericSetup/differ.py
U Products.GenericSetup/trunk/Products/GenericSetup/registry.py
U Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py
U Products.GenericSetup/trunk/Products/GenericSetup/testing.py
U Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
U Products.GenericSetup/trunk/Products/GenericSetup/tool.py
U Products.GenericSetup/trunk/Products/GenericSetup/utils.py
-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt 2010-02-01 10:51:10 UTC (rev 108683)
@@ -4,7 +4,9 @@
1.6.0 (unreleased)
------------------
+- Removed backwards compatibility code for no longer supported Zope versions.
+
1.6.0b1 (2010-01-31)
--------------------
Modified: Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/configure.zcml
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/configure.zcml 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/configure.zcml 2010-02-01 10:51:10 UTC (rev 108683)
@@ -10,15 +10,6 @@
<adapter factory=".exportimport.PathIndexNodeAdapter"/>
- <!-- BBB: for Zope < 2.12 -->
- <configure zcml:condition="installed Products.PluginIndexes.TextIndex">
-
- <adapter factory=".exportimport.VocabularyNodeAdapter"/>
-
- <adapter factory=".exportimport.TextIndexNodeAdapter"/>
-
- </configure>
-
<adapter factory=".exportimport.FilteredSetNodeAdapter"/>
<adapter factory=".exportimport.TopicIndexNodeAdapter"/>
Modified: Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/exportimport.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/exportimport.py 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/PluginIndexes/exportimport.py 2010-02-01 10:51:10 UTC (rev 108683)
@@ -29,13 +29,6 @@
from Products.PluginIndexes.interfaces import IPathIndex
from Products.PluginIndexes.interfaces import IPluggableIndex
from Products.PluginIndexes.interfaces import ITopicIndex
-# BBB: for Zope < 2.12
-try:
- from Products.PluginIndexes.interfaces import ITextIndex
- from Products.PluginIndexes.interfaces import IVocabulary
-except ImportError:
- ITextIndex = None
- IVocabulary = None
class PluggableIndexNodeAdapter(NodeAdapterBase):
@@ -135,42 +128,6 @@
node = property(_exportNode, lambda self, val: None)
-if IVocabulary is not None: # BBB: for Zope < 2.12
- class VocabularyNodeAdapter(NodeAdapterBase):
-
- """Node im- and exporter for Vocabulary.
- """
-
- adapts(IVocabulary, ISetupEnviron)
-
- def _exportNode(self):
- """Export the object as a DOM node.
- """
- node = self._getObjectNode('object')
- node.setAttribute('deprecated', 'True')
- return node
-
- node = property(_exportNode, lambda self, val: None)
-
-
-if ITextIndex is not None:# BBB: for Zope < 2.12
- class TextIndexNodeAdapter(NodeAdapterBase):
-
- """Node im- and exporter for TextIndex.
- """
-
- adapts(ITextIndex, ISetupEnviron)
-
- def _exportNode(self):
- """Export the object as a DOM node.
- """
- node = self._getObjectNode('index')
- node.setAttribute('deprecated', 'True')
- return node
-
- node = property(_exportNode, lambda self, val: None)
-
-
class FilteredSetNodeAdapter(NodeAdapterBase):
"""Node im- and exporter for FilteredSet.
Modified: Products.GenericSetup/trunk/Products/GenericSetup/components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/components.py 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/components.py 2010-02-01 10:51:10 UTC (rev 108683)
@@ -17,6 +17,8 @@
from operator import itemgetter
+from Acquisition import aq_base
+from Acquisition import aq_parent
from zope.component import adapts
from zope.component import getUtilitiesFor
from zope.component import queryMultiAdapter
@@ -24,9 +26,6 @@
from zope.component.interfaces import IComponentRegistry
from zope.location.interfaces import IPossibleSite
-from Acquisition import aq_base
-from Acquisition import aq_parent
-
from Products.GenericSetup.interfaces import IBody
from Products.GenericSetup.interfaces import IComponentsHandlerBlacklist
from Products.GenericSetup.interfaces import ISetupEnviron
@@ -340,11 +339,7 @@
if ofs_id not in self.context.objectIds():
self.context._setObject(ofs_id, aq_base(obj),
set_owner=False, suppress_events=True)
- try:
- getter = self.context.get
- except AttributeError:
- getter = self.context._getOb # BBB: Zope <= 2.10.x
- obj = getter(ofs_id)
+ obj = self.context.get(ofs_id)
obj.__name__ = ofs_id
obj.__parent__ = aq_base(self.context)
self.context.registerUtility(aq_base(obj), provided, name)
Modified: Products.GenericSetup/trunk/Products/GenericSetup/context.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/context.py 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/context.py 2010-02-01 10:51:10 UTC (rev 108683)
@@ -30,11 +30,7 @@
from Acquisition import aq_parent
from Acquisition import aq_self
from Acquisition import Implicit
-try:
- from App.class_init import InitializeClass
-except ImportError:
- # BBB for Zope <2.11
- from Globals import InitializeClass
+from App.class_init import InitializeClass
from DateTime.DateTime import DateTime
from OFS.DTMLDocument import DTMLDocument
from OFS.Folder import Folder
Modified: Products.GenericSetup/trunk/Products/GenericSetup/differ.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/differ.py 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/differ.py 2010-02-01 10:51:10 UTC (rev 108683)
@@ -19,11 +19,7 @@
import re
from AccessControl.SecurityInfo import ClassSecurityInfo
-try:
- from App.class_init import InitializeClass
-except ImportError:
- # BBB for Zope <2.11
- from Globals import InitializeClass
+from App.class_init import InitializeClass
from Products.GenericSetup.interfaces import SKIPPED_FILES
Modified: Products.GenericSetup/trunk/Products/GenericSetup/registry.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/registry.py 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/registry.py 2010-02-01 10:51:10 UTC (rev 108683)
@@ -20,12 +20,7 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-try:
- from App.class_init import InitializeClass
-except ImportError:
- # BBB for Zope <2.11
- from Globals import InitializeClass
-
+from App.class_init import InitializeClass
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from zope.interface import implements
@@ -253,8 +248,6 @@
o The 'handler' metadata is available via 'getStep'.
"""
- result = {}
-
info = self._registered.get( key )
if info is None:
@@ -740,5 +733,3 @@
InitializeClass( ProfileRegistry )
_profile_registry = ProfileRegistry()
-
-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py 2010-02-01 10:51:10 UTC (rev 108683)
@@ -17,11 +17,7 @@
from AccessControl.Permission import Permission
from AccessControl.SecurityInfo import ClassSecurityInfo
-try:
- from App.class_init import InitializeClass
-except ImportError:
- # BBB for Zope <2.11
- from Globals import InitializeClass
+from App.class_init import InitializeClass
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.GenericSetup.permissions import ManagePortal
Modified: Products.GenericSetup/trunk/Products/GenericSetup/testing.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/testing.py 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/testing.py 2010-02-01 10:51:10 UTC (rev 108683)
@@ -17,6 +17,7 @@
import unittest
import Testing
+from Testing.ZopeTestCase.layer import ZopeLite
from xml.dom.minidom import parseString
@@ -141,7 +142,7 @@
self.assertEqual(adapted.node.toprettyxml(' '), self._XML)
-class ExportImportZCMLLayer:
+class ExportImportZCMLLayer(ZopeLite):
@classmethod
def setUp(cls):
@@ -161,15 +162,6 @@
cleanUp()
-# Derive from ZopeLite layer if available
-try:
- from Testing.ZopeTestCase.layer import ZopeLite
-except ImportError:
- pass # BBB: Zope < 2.11
-else:
- ExportImportZCMLLayer.__bases__ = (ZopeLite,)
-
-
def run(test_suite):
options = testrunner.get_options()
options.resume_layer = None
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py 2010-02-01 10:51:10 UTC (rev 108683)
@@ -20,24 +20,14 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-try:
- from App.class_init import InitializeClass
-except ImportError:
- # BBB: for Zope < 2.11
- from Globals import InitializeClass
+from App.class_init import InitializeClass
from OFS.Folder import Folder
from OFS.SimpleItem import SimpleItem
from Products.Five.component import enableSite
from Products.Five.component.interfaces import IObjectManagerSite
-try:
- from zope.site.hooks import clearSite
- from zope.site.hooks import setHooks
- from zope.site.hooks import setSite
-except ImportError:
- # BBB: for Zope < 2.12
- from zope.app.component.hooks import clearSite
- from zope.app.component.hooks import setHooks
- from zope.app.component.hooks import setSite
+from zope.site.hooks import clearSite
+from zope.site.hooks import setHooks
+from zope.site.hooks import setSite
from zope.component import getMultiAdapter
from zope.component import getGlobalSiteManager
from zope.component import getSiteManager
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tool.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tool.py 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tool.py 2010-02-01 10:51:10 UTC (rev 108683)
@@ -22,11 +22,7 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-try:
- from App.class_init import InitializeClass
-except ImportError:
- # BBB for Zope <2.11
- from Globals import InitializeClass
+from App.class_init import InitializeClass
from OFS.Folder import Folder
from OFS.Image import File
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
@@ -107,7 +103,6 @@
toolset.parseXML(xml, encoding)
existing_ids = site.objectIds()
- existing_values = site.objectValues()
for tool_id in toolset.listForbiddenTools():
Modified: Products.GenericSetup/trunk/Products/GenericSetup/utils.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/utils.py 2010-02-01 09:58:15 UTC (rev 108682)
+++ Products.GenericSetup/trunk/Products/GenericSetup/utils.py 2010-02-01 10:51:10 UTC (rev 108683)
@@ -28,11 +28,7 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-try:
- from App.class_init import InitializeClass
-except ImportError:
- # BBB for Zope <2.11
- from Globals import InitializeClass
+from App.class_init import InitializeClass
from App.Common import package_home
from OFS.interfaces import IOrderedContainer
from Products.Five.utilities.interfaces import IMarkerInterfaces
@@ -40,13 +36,11 @@
from zope.interface import directlyProvides
from zope.interface import implements
from zope.interface import implementsOnly
-from zope.interface import providedBy
from ZPublisher.HTTPRequest import default_encoding
from Products.GenericSetup.exceptions import BadRequest
from Products.GenericSetup.interfaces import IBody
from Products.GenericSetup.interfaces import INode
-from Products.GenericSetup.interfaces import ISetupContext
from Products.GenericSetup.interfaces import ISetupTool
from Products.GenericSetup.permissions import ManagePortal
@@ -621,7 +615,7 @@
def _fauxAdapt(self, context):
from OFS.PropertySheets import PropertySheet
- helper_self = self
+
class Adapted(PropertySheet):
def __init__(self, real, properties):
self._real = real
More information about the checkins
mailing list