[Checkins] SVN: Products.CMFCore/trunk/ - moved the Zope dependency to version 2.12.0b3dev
Yvo Schubbe
y.2009 at wcm-solutions.de
Tue Jul 7 08:00:02 EDT 2009
Log message for revision 101693:
- moved the Zope dependency to version 2.12.0b3dev
- updated some imports
- removed obsolete BBB code
Changed:
U Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
U Products.CMFCore/trunk/Products/CMFCore/CMFCatalogAware.py
U Products.CMFCore/trunk/Products/CMFCore/CachingPolicyManager.py
U Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py
U Products.CMFCore/trunk/Products/CMFCore/Extensions/migrateToCMF21.py
U Products.CMFCore/trunk/Products/CMFCore/TypesTool.py
U Products.CMFCore/trunk/Products/CMFCore/browser/configure.zcml
U Products.CMFCore/trunk/Products/CMFCore/testing.py
U Products.CMFCore/trunk/Products/CMFCore/tests/base/dummy.py
U Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py
UU Products.CMFCore/trunk/Products/CMFCore/tests/test_FSDTMLMethod.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_FSPageTemplate.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py
U Products.CMFCore/trunk/setup.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt 2009-07-07 12:00:01 UTC (rev 101693)
@@ -4,6 +4,8 @@
2.2.0 (unreleased)
------------------
+- moved the Zope dependency to version 2.12.0b3dev
+
- PortalFolder: Modified allowedContentTypes method to check
isConstructionAllowed only for allowed types, not for all content types.
Modified: Products.CMFCore/trunk/Products/CMFCore/CMFCatalogAware.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CMFCatalogAware.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/CMFCatalogAware.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -24,9 +24,9 @@
from ExtensionClass import Base
from OFS.interfaces import IObjectClonedEvent
from OFS.interfaces import IObjectWillBeMovedEvent
-from zope.app.container.interfaces import IObjectAddedEvent
-from zope.app.container.interfaces import IObjectMovedEvent
from zope.component import subscribers
+from zope.container.interfaces import IObjectAddedEvent
+from zope.container.interfaces import IObjectMovedEvent
from zope.interface import implements
from zope.lifecycleevent.interfaces import IObjectCopiedEvent
from zope.lifecycleevent.interfaces import IObjectCreatedEvent
Modified: Products.CMFCore/trunk/Products/CMFCore/CachingPolicyManager.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CachingPolicyManager.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/CachingPolicyManager.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -29,7 +29,7 @@
from Persistence import PersistentMapping
from Products.PageTemplates.Expressions import getEngine
from Products.PageTemplates.Expressions import SecureModuleImporter
-from zope.app.container.interfaces import IObjectMovedEvent
+from zope.container.interfaces import IObjectMovedEvent
from zope.interface import implements
from Products.CMFCore.Expression import Expression
Modified: Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -28,7 +28,7 @@
from OFS.Folder import Folder
from OFS.interfaces import IObjectWillBeMovedEvent
from zExceptions import Redirect
-from zope.app.container.interfaces import IObjectMovedEvent
+from zope.container.interfaces import IObjectMovedEvent
from zope.interface import implements
from ZPublisher import BeforeTraverse
from ZPublisher.HTTPRequest import HTTPRequest
Modified: Products.CMFCore/trunk/Products/CMFCore/Extensions/migrateToCMF21.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/Extensions/migrateToCMF21.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/Extensions/migrateToCMF21.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -18,8 +18,8 @@
"""
from zope.component import getSiteManager
-from zope.app.component.hooks import setSite
from zope.dottedname.resolve import resolve
+from zope.site.hooks import setSite
from logging import getLogger
import sys
import transaction
Modified: Products.CMFCore/trunk/Products/CMFCore/TypesTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/TypesTool.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/TypesTool.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -27,11 +27,11 @@
from OFS.Folder import Folder
from OFS.ObjectManager import IFAwareObjectManager
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from zope.app.container.contained import ObjectAddedEvent
-from zope.app.container.contained import notifyContainerModified
from zope.component import getUtility
from zope.component import queryUtility
from zope.component.interfaces import IFactory
+from zope.container.contained import ObjectAddedEvent
+from zope.container.contained import notifyContainerModified
from zope.event import notify
from zope.i18nmessageid import Message
from zope.interface import implements
Modified: Products.CMFCore/trunk/Products/CMFCore/browser/configure.zcml
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/browser/configure.zcml 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/browser/configure.zcml 2009-07-07 12:00:01 UTC (rev 101693)
@@ -6,7 +6,7 @@
<configure package="Products.GenericSetup.browser">
<browser:page
- for="zope.app.container.interfaces.IAdding"
+ for="zope.browser.interfaces.IAdding"
name="addAction.html"
template="addWithPresettings.pt"
class="Products.CMFCore.browser.actions.ActionAddView"
@@ -14,7 +14,7 @@
/>
<browser:page
- for="zope.app.container.interfaces.IAdding"
+ for="zope.browser.interfaces.IAdding"
name="addActionCategory.html"
template="addWithPresettings.pt"
class="Products.CMFCore.browser.actions.ActionCategoryAddView"
@@ -22,7 +22,7 @@
/>
<browser:page
- for="zope.app.container.interfaces.IAdding"
+ for="zope.browser.interfaces.IAdding"
name="addFactoryTypeInformation.html"
template="addWithPresettings.pt"
class="Products.CMFCore.browser.typeinfo.FactoryTypeInformationAddView"
@@ -30,7 +30,7 @@
/>
<browser:page
- for="zope.app.container.interfaces.IAdding"
+ for="zope.browser.interfaces.IAdding"
name="addScriptableTypeInformation.html"
template="addWithPresettings.pt"
class="Products.CMFCore.browser.typeinfo.ScriptableTypeInformationAddView"
Modified: Products.CMFCore/trunk/Products/CMFCore/testing.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/testing.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/testing.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -17,12 +17,13 @@
from OFS.SimpleItem import SimpleItem
from Products.Five import zcml
-from zope.app.component.hooks import setHooks
+from Testing.ZopeTestCase.layer import ZopeLite
from zope.component import adapts
from zope.i18n.interfaces import IUserPreferredLanguages
from zope.interface import implements
from zope.interface.verify import verifyClass
from zope.publisher.interfaces.http import IHTTPRequest
+from zope.site.hooks import setHooks
from zope.testing import testrunner
from zope.testing.cleanup import cleanUp
@@ -90,7 +91,7 @@
return ('test',)
-class EventZCMLLayer:
+class EventZCMLLayer(ZopeLite):
@classmethod
def testSetUp(cls):
@@ -106,7 +107,7 @@
cleanUp()
-class TraversingZCMLLayer:
+class TraversingZCMLLayer(ZopeLite):
@classmethod
def testSetUp(cls):
@@ -121,7 +122,7 @@
cleanUp()
-class TraversingEventZCMLLayer:
+class TraversingEventZCMLLayer(ZopeLite):
@classmethod
def testSetUp(cls):
@@ -138,7 +139,7 @@
cleanUp()
-class FunctionalZCMLLayer:
+class FunctionalZCMLLayer(ZopeLite):
@classmethod
def setUp(cls):
@@ -193,7 +194,7 @@
body = property(BodyAdapterBase._exportBody, BodyAdapterBase._importBody)
-class ExportImportZCMLLayer:
+class ExportImportZCMLLayer(ZopeLite):
@classmethod
def testSetUp(cls):
@@ -217,19 +218,6 @@
cleanUp()
-# Derive from ZopeLite layer if available
-try:
- from Testing.ZopeTestCase.layer import ZopeLite
-except ImportError:
- pass # Zope < 2.11
-else:
- EventZCMLLayer.__bases__ = (ZopeLite,)
- TraversingZCMLLayer.__bases__ = (ZopeLite,)
- TraversingEventZCMLLayer.__bases__ = (ZopeLite,)
- FunctionalZCMLLayer.__bases__ = (ZopeLite,)
- ExportImportZCMLLayer.__bases__ = (ZopeLite,)
-
-
def run(test_suite):
options = testrunner.get_options()
options.resume_layer = None
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/base/dummy.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/base/dummy.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/base/dummy.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -21,10 +21,10 @@
from OFS.interfaces import IObjectManager
from OFS.SimpleItem import Item
from webdav.common import rfc1123_date
-from zope.app.container.contained import notifyContainerModified
-from zope.app.container.contained import ObjectAddedEvent
-from zope.app.container.contained import ObjectRemovedEvent
from zope.component.factory import Factory
+from zope.container.contained import notifyContainerModified
+from zope.container.contained import ObjectAddedEvent
+from zope.container.contained import ObjectRemovedEvent
from zope.event import notify
from zope.interface import implements
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -1,5 +1,6 @@
import unittest
from Testing import ZopeTestCase
+from Testing.ZopeTestCase.layer import ZopeLite
import sys
import time
@@ -80,12 +81,7 @@
class TransactionalTest(unittest.TestCase):
- try:
- from Testing.ZopeTestCase.layer import ZopeLite
- except ImportError:
- pass # Zope < 2.11
- else:
- layer = ZopeLite
+ layer = ZopeLite
def setUp(self):
transaction.begin()
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_FSDTMLMethod.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_FSDTMLMethod.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_FSDTMLMethod.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -12,7 +12,7 @@
##############################################################################
""" Unit tests for FSDTMLMethod module.
-$Id: test_FSDTMLMethod.py 37061 2005-06-15 14:17:41Z tseaver $
+$Id$
"""
import unittest
@@ -24,7 +24,7 @@
from DateTime import DateTime
from OFS.Folder import Folder
from Products.StandardCacheManagers import RAMCacheManager
-from zope.app.component.hooks import setHooks
+from zope.site.hooks import setHooks
from Products.CMFCore.FSDTMLMethod import FSDTMLMethod
from Products.CMFCore.FSMetadata import FSMetadata
Property changes on: Products.CMFCore/trunk/Products/CMFCore/tests/test_FSDTMLMethod.py
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_FSPageTemplate.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_FSPageTemplate.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_FSPageTemplate.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -64,7 +64,7 @@
def test_Call( self ):
script = self._makeOne( 'testPT', 'testPT.pt' )
script = script.__of__(self.app)
- self.assertEqual(script()[:6], 'nohost') #BBB: Zope 2.11 adds \n
+ self.assertEqual(script(), 'nohost')
def test_ContentType(self):
script = self._makeOne( 'testXMLPT', 'testXMLPT.pt' )
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_TypesTool.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -537,10 +537,10 @@
def test_events(self):
from OFS.interfaces import IObjectWillBeAddedEvent
- from zope.app.container.interfaces import IContainerModifiedEvent
- from zope.app.container.interfaces import IObjectAddedEvent
from zope.component import adapter
from zope.component import provideHandler
+ from zope.container.interfaces import IContainerModifiedEvent
+ from zope.container.interfaces import IObjectAddedEvent
from zope.lifecycleevent.interfaces import IObjectCreatedEvent
events = []
@@ -609,10 +609,10 @@
def test_events(self):
from OFS.interfaces import IObjectWillBeAddedEvent
- from zope.app.container.interfaces import IContainerModifiedEvent
- from zope.app.container.interfaces import IObjectAddedEvent
from zope.component import adapter
from zope.component import provideHandler
+ from zope.container.interfaces import IContainerModifiedEvent
+ from zope.container.interfaces import IObjectAddedEvent
from zope.lifecycleevent.interfaces import IObjectCreatedEvent
events = []
Modified: Products.CMFCore/trunk/setup.py
===================================================================
--- Products.CMFCore/trunk/setup.py 2009-07-07 11:58:11 UTC (rev 101692)
+++ Products.CMFCore/trunk/setup.py 2009-07-07 12:00:01 UTC (rev 101693)
@@ -45,9 +45,9 @@
setup_requires=['eggtestinfo',
],
install_requires=[
- #'Zope >= 2.10.4',
'setuptools',
- 'five.localsitemanager>=0.3',
+ 'Zope2 >= 2.12.0b3dev',
+ 'five.localsitemanager >= 0.3',
'Products.GenericSetup',
],
tests_require=[
More information about the Checkins
mailing list