[Checkins] SVN: Products.CMFCore/trunk/ - Zope2 >= 2.12.11dev is now required

[Yvo Schubbe]

Log message for revision 115371:
  - Zope2 >= 2.12.11dev is now required

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  UU  Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py
  U   Products.CMFCore/trunk/setup.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2010-08-02 09:28:54 UTC (rev 115370)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2010-08-02 09:41:36 UTC (rev 115371)
@@ -4,6 +4,8 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Require at least Zope 2.12.11.
+
 - DateTime 2.12.5 does away with a special case representing
   DateTime values for midnight (00:00:00) without their time and
   time zone values. So DateTimes formerly rendered as

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py	2010-08-02 09:28:54 UTC (rev 115370)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py	2010-08-02 09:41:36 UTC (rev 115371)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """CookieCrumbler tests.
-
-$Id$
 """
 
 import unittest
@@ -72,17 +70,12 @@
 
     def _makeSite(self):
         import base64
-        from cStringIO import StringIO
         import urllib
+        from cStringIO import StringIO
 
-        try:
-            from OFS.userfolder import UserFolder
-        except ImportError:
-            # BBB for Zope < 2.13
-            from AccessControl.User import UserFolder
-        
-        from OFS.Folder import Folder
         from OFS.DTMLMethod import DTMLMethod
+        from OFS.Folder import Folder
+        from OFS.userfolder import UserFolder
 
         root = Folder()
         root.isTopLevelPrincipiaApplicationObject = 1  # User folder needs this
@@ -252,6 +245,3 @@
     return unittest.TestSuite((
         unittest.makeSuite(CookieCrumblerTests),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')


Property changes on: Products.CMFCore/trunk/Products/CMFCore/tests/test_CookieCrumbler.py
___________________________________________________________________
Deleted: svn:keywords
   - Author Date Id Revision

Modified: Products.CMFCore/trunk/setup.py
===================================================================
--- Products.CMFCore/trunk/setup.py	2010-08-02 09:28:54 UTC (rev 115370)
+++ Products.CMFCore/trunk/setup.py	2010-08-02 09:41:36 UTC (rev 115371)
@@ -46,7 +46,7 @@
                      ],
       install_requires=[
           'setuptools',
-          'Zope2 > 2.12.8',
+          'Zope2 >= 2.12.11dev',
           'five.localsitemanager',
           'Products.GenericSetup',
           'Products.ZSQLMethods',