[Checkins] SVN: Products.CMFUid/trunk/ - moved the Zope dependency to version 2.12.0b3dev
Yvo Schubbe
y.2009 at wcm-solutions.de
Tue Jul 7 08:03:18 EDT 2009
Log message for revision 101696:
- moved the Zope dependency to version 2.12.0b3dev
- updated some imports
- removed obsolete BBB code
Changed:
U Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt
U Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py
U Products.CMFUid/trunk/Products/CMFUid/testing.py
U Products.CMFUid/trunk/setup.py
-=-
Modified: Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt 2009-07-07 12:02:25 UTC (rev 101695)
+++ Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt 2009-07-07 12:03:17 UTC (rev 101696)
@@ -4,6 +4,8 @@
2.2.0 (unreleased)
------------------
+- moved the Zope dependency to version 2.12.0b3dev
+
- Cleaned up / normalized imports:
o Don't import from Globals; instead, use real locations.
Modified: Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py 2009-07-07 12:02:25 UTC (rev 101695)
+++ Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py 2009-07-07 12:03:17 UTC (rev 101696)
@@ -24,8 +24,8 @@
from OFS.PropertyManager import PropertyManager
from OFS.SimpleItem import SimpleItem
from Persistence import Persistent
-from zope.app.container.interfaces import IObjectAddedEvent
from zope.component import queryUtility
+from zope.container.interfaces import IObjectAddedEvent
from zope.interface import implements
from Products.CMFCore.utils import getToolByName
Modified: Products.CMFUid/trunk/Products/CMFUid/testing.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/testing.py 2009-07-07 12:02:25 UTC (rev 101695)
+++ Products.CMFUid/trunk/Products/CMFUid/testing.py 2009-07-07 12:03:17 UTC (rev 101696)
@@ -1,9 +1,11 @@
-from zope.app.component.hooks import setHooks
+from Testing.ZopeTestCase.layer import ZopeLite
+from zope.site.hooks import setHooks
from zope.testing.cleanup import cleanUp
from Products.Five import zcml
-class UidEventZCMLLayer:
+class UidEventZCMLLayer(ZopeLite):
+
@classmethod
def testSetUp(cls):
import Products
@@ -16,13 +18,3 @@
@classmethod
def testTearDown(cls):
cleanUp()
-
-
-# Derive from ZopeLite layer if available
-try:
- from Testing.ZopeTestCase.layer import ZopeLite
-except ImportError:
- pass # Zope < 2.11
-else:
- UidEventZCMLLayer.__bases__ = (ZopeLite,)
-
Modified: Products.CMFUid/trunk/setup.py
===================================================================
--- Products.CMFUid/trunk/setup.py 2009-07-07 12:02:25 UTC (rev 101695)
+++ Products.CMFUid/trunk/setup.py 2009-07-07 12:03:17 UTC (rev 101696)
@@ -45,13 +45,14 @@
setup_requires=['eggtestinfo',
],
install_requires=[
- #'Zope >= 2.10.4',
'setuptools',
+ 'Zope2 >= 2.12.0b3dev',
'Products.CMFCore',
'Products.GenericSetup',
],
- tests_require=['zope.testing>=3.7.0',
- ],
+ tests_require=[
+ 'zope.testing >= 3.7.0',
+ ],
test_loader='zope.testing.testrunner.eggsupport:SkipLayers',
test_suite='Products.%s.tests' % NAME,
entry_points="""
More information about the Checkins
mailing list