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

[Yvo Schubbe]

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

Changed:
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Calendar.py
  U   Products.CMFCalendar/trunk/setup.py

-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2009-07-07 11:57:08 UTC (rev 101691)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2009-07-07 11:58:11 UTC (rev 101692)
@@ -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.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt	2009-07-07 11:57:08 UTC (rev 101691)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt	2009-07-07 11:58:11 UTC (rev 101692)
@@ -3,7 +3,7 @@
 
 Set up site, user and Event.
 
-    >>> from zope.app.component.hooks import setSite
+    >>> from zope.site.hooks import setSite
     >>> setSite(app.site)
     >>> uf = app.site.acl_users
     >>> uf._doAddUser('mgr', 'mgrpw', ['Manager'], [])

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Calendar.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Calendar.py	2009-07-07 11:57:08 UTC (rev 101691)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Calendar.py	2009-07-07 11:58:11 UTC (rev 101692)
@@ -24,8 +24,8 @@
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.User import UnrestrictedUser
 from DateTime import DateTime
-from zope.app.component.hooks import setSite
 from zope.interface.verify import verifyClass
+from zope.site.hooks import setSite
 
 from Products.CMFCalendar.testing import FunctionalLayer
 

Modified: Products.CMFCalendar/trunk/setup.py
===================================================================
--- Products.CMFCalendar/trunk/setup.py	2009-07-07 11:57:08 UTC (rev 101691)
+++ Products.CMFCalendar/trunk/setup.py	2009-07-07 11:58:11 UTC (rev 101692)
@@ -46,7 +46,7 @@
                      ],
       install_requires=[
           'setuptools',
-          #'Zope2 >= 2.10.4',
+          'Zope2 >= 2.12.0b3dev',
           'Products.CMFCore',
           'Products.CMFDefault',
           'Products.GenericSetup',