[Checkins] SVN: Products.CMFDefault/trunk/ - require at least Zope 2.13.4

Yvo Schubbe y.2011 at wcm-solutions.de
Sat Feb 19 05:05:57 EST 2011


Log message for revision 120434:
  - require at least Zope 2.13.4

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/portal_config.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/favorite.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/file.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/link.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/authentication.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/join.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/password.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.txt
  UU  Products.CMFDefault/trunk/Products/CMFDefault/testing.py
  U   Products.CMFDefault/trunk/setup.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -4,7 +4,7 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
-- Require at least Zope 2.12.11.
+- Require at least Zope 2.13.4.
 
 - profiles and upgrade: Added support for using the new OFS UserFolder class.
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/portal_config.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/portal_config.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/portal_config.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -10,11 +10,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
 
 Log the user in

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -8,12 +8,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
-
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -13,12 +13,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
-
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/favorite.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/favorite.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/favorite.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -8,12 +8,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
-
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/file.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/file.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/file.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -8,12 +8,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
-
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -10,12 +10,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
-
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -1,5 +1,5 @@
 Image Views
-----------
+-----------
 
 For edit tests see "file.txt"
 
@@ -10,12 +10,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
-
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/link.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/link.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/link.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -8,12 +8,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
-
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -12,12 +12,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
-
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py	2011-02-19 10:05:57 UTC (rev 120434)
@@ -13,12 +13,8 @@
 """ Shared utility functions for browser view tests
 """
 
-try:
-    from Zope2.App.schema import Zope2VocabularyRegistry
-except ImportError:  # Zope2 <= 2.12
-    from Products.Five.schema import Zope2VocabularyRegistry
+from Zope2.App.schema import Zope2VocabularyRegistry
 
-
 def setupVocabulary(testcase):
     from zope.schema.vocabulary import setVocabularyRegistry
     setVocabularyRegistry(Zope2VocabularyRegistry())

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/authentication.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/authentication.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/authentication.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -10,11 +10,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> # XXX: browser has no API for disabling redirects
     >>> browser.mech_browser.set_handle_redirect(False)

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/join.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/join.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/join.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -3,11 +3,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
 
 Set properties to validation not required.

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -10,11 +10,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
 
 Log the user in

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/password.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/password.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/password.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -1,5 +1,5 @@
 Password views
-----------
+--------------
 
 Set up user.
 
@@ -10,11 +10,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
 
 Log the user in

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -10,11 +10,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
 
 Log the user in

Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.txt	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.txt	2011-02-19 10:05:57 UTC (rev 120434)
@@ -8,12 +8,7 @@
 
 Create the browser object we'll be using.
 
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Testing.testbrowser import Browser
-    ... except ImportError:
-    ...     from Products.Five.testbrowser import Browser
-
+    >>> from Testing.testbrowser import Browser
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -21,13 +16,7 @@
 Register the content class and factory.
 
     >>> from Products.CMFDefault.formlib.tests import CONTENT_ZCML
-
-    # BBB for Zope 2.12
-    >>> try:
-    ...     from Zope2.App import zcml
-    ... except ImportError:
-    ...     from Products.Five import zcml
-
+    >>> from Zope2.App import zcml
     >>> zcml.load_string(CONTENT_ZCML)
 
 Create the type info object.
@@ -121,4 +110,3 @@
     True
     >>> 'MY_ID2' in app.site.contentIds()
     True
-

Modified: Products.CMFDefault/trunk/Products/CMFDefault/testing.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/testing.py	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/Products/CMFDefault/testing.py	2011-02-19 10:05:57 UTC (rev 120434)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ Unit test layers.
-
-$Id$
 """
 
 from Testing import ZopeTestCase
@@ -20,17 +18,12 @@
 ZopeTestCase.installProduct('CMFCore', 1)
 
 import transaction
+from Zope2.App import zcml
 
 from Products.CMFCore.testing import FunctionalZCMLLayer
 from Products.CMFDefault.factory import addConfiguredSite
 
-# BBB for Zope 2.12
-try:
-    from Zope2.App import zcml
-except ImportError:
-    from Products.Five import zcml
 
-
 class FunctionalLayer(FunctionalZCMLLayer):
 
     @classmethod
@@ -53,4 +46,3 @@
         app._delObject('site')
         transaction.commit()
         ZopeTestCase.close(app)
-


Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/testing.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Products.CMFDefault/trunk/setup.py
===================================================================
--- Products.CMFDefault/trunk/setup.py	2011-02-19 10:05:09 UTC (rev 120433)
+++ Products.CMFDefault/trunk/setup.py	2011-02-19 10:05:57 UTC (rev 120434)
@@ -46,12 +46,12 @@
                      ],
       install_requires=[
           'setuptools',
-          'Zope2 >= 2.12.11',
-          'five.formlib >= 1.0.2',
+          'Zope2 >= 2.13.4',
+          'five.formlib',
           'Products.CMFCore',
           'Products.GenericSetup',
-#          'Products.MailHost', # BBB: disabled for Zope 2.12
-#          'Products.PythonScripts', # BBB: disabled for Zope 2.12
+          'Products.MailHost',
+          'Products.PythonScripts',
           ],
       tests_require=[
           'zope.testing >= 3.7.0',



More information about the checkins mailing list