[Checkins] SVN: Products.CMFTopic/trunk/ - moved the Zope dependency to version 2.12.0b3dev

[Yvo Schubbe]

Log message for revision 101695:
  - moved the Zope dependency to version 2.12.0b3dev
  - updated some imports

Changed:
  U   Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
  U   Products.CMFTopic/trunk/Products/CMFTopic/tests/test_DateC.py
  U   Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py
  U   Products.CMFTopic/trunk/setup.py

-=-
Modified: Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt	2009-07-07 12:01:11 UTC (rev 101694)
+++ Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt	2009-07-07 12:02:25 UTC (rev 101695)
@@ -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.CMFTopic/trunk/Products/CMFTopic/tests/test_DateC.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/tests/test_DateC.py	2009-07-07 12:01:11 UTC (rev 101694)
+++ Products.CMFTopic/trunk/Products/CMFTopic/tests/test_DateC.py	2009-07-07 12:02:25 UTC (rev 101695)
@@ -19,7 +19,7 @@
 from Testing import ZopeTestCase
 
 from DateTime.DateTime import DateTime
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
 
 from Products.CMFCore.tests.base.dummy import DummyContent
 from Products.CMFDefault.testing import FunctionalLayer

Modified: Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py	2009-07-07 12:01:11 UTC (rev 101694)
+++ Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py	2009-07-07 12:02:25 UTC (rev 101695)
@@ -23,9 +23,9 @@
 from AccessControl.User import UnrestrictedUser
 from Acquisition import Implicit
 
-from zope.app.component.hooks import setSite
 from zope.component import getSiteManager
 from zope.interface.verify import verifyClass
+from zope.site.hooks import setSite
 
 from Products.CMFCore.interfaces import ISyndicationTool
 from Products.CMFCore.testing import ConformsToFolder

Modified: Products.CMFTopic/trunk/setup.py
===================================================================
--- Products.CMFTopic/trunk/setup.py	2009-07-07 12:01:11 UTC (rev 101694)
+++ Products.CMFTopic/trunk/setup.py	2009-07-07 12:02:25 UTC (rev 101695)
@@ -46,7 +46,7 @@
                      ],
       install_requires=[
           'setuptools',
-          #'Zope2 >= 2.10.4',
+          'Zope2 >= 2.12.0b3dev',
           'Products.CMFCore',
           'Products.CMFDefault',
           'Products.GenericSetup',