[Checkins] SVN: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/ merged 111308-113205 from trunk

Yvo Schubbe y.2010 at wcm-solutions.de
Mon Jun 7 05:38:44 EDT 2010


Log message for revision 113235:
  merged 111308-113205 from trunk

Changed:
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/authentication.txt
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/btreefolder.txt
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/document.txt
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/favorite.txt
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/file.txt
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/folder.txt
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/link.txt
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/metadata.txt
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/formlib/form.txt
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/formlib/tests.py
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/testing.py

-=-
Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/CHANGES.txt	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/CHANGES.txt	2010-06-07 09:38:43 UTC (rev 113235)
@@ -4,6 +4,10 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Deal with deprecation warnings for Zope 2.13.
+
+- Use the standard libraries doctest module.
+
 - skins: Removed unused styles from css.
 
 - Require at least Zope 2.12.3 and use the optional five.formlib extension.

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/authentication.txt
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/authentication.txt	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/authentication.txt	2010-06-07 09:38:43 UTC (rev 113235)
@@ -10,9 +10,10 @@
 
 Create the browser object we'll be using.
 
+    # BBB for Zope 2.12
     >>> try:
     ...     from Testing.testbrowser import Browser
-    ... except ImportError: # BBB: for Zope 2.12
+    ... except ImportError:
     ...     from Products.Five.testbrowser import Browser
     >>> browser = Browser()
     >>> # XXX: browser has no API for disabling redirects

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/btreefolder.txt
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/btreefolder.txt	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/btreefolder.txt	2010-06-07 09:38:43 UTC (rev 113235)
@@ -8,7 +8,12 @@
 
 Create the browser object we'll be using.
 
-    >>> from Products.Five.testbrowser import Browser
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
+
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/document.txt
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/document.txt	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/document.txt	2010-06-07 09:38:43 UTC (rev 113235)
@@ -13,7 +13,12 @@
 
 Create the browser object we'll be using.
 
-    >>> from Products.Five.testbrowser import Browser
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
+
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/favorite.txt
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/favorite.txt	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/favorite.txt	2010-06-07 09:38:43 UTC (rev 113235)
@@ -8,7 +8,12 @@
 
 Create the browser object we'll be using.
 
-    >>> from Products.Five.testbrowser import Browser
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
+
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/file.txt
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/file.txt	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/file.txt	2010-06-07 09:38:43 UTC (rev 113235)
@@ -8,7 +8,12 @@
 
 Create the browser object we'll be using.
 
-    >>> from Products.Five.testbrowser import Browser
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
+
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/folder.txt
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/folder.txt	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/folder.txt	2010-06-07 09:38:43 UTC (rev 113235)
@@ -10,7 +10,12 @@
 
 Create the browser object we'll be using.
 
-    >>> from Products.Five.testbrowser import Browser
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
+
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/link.txt
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/link.txt	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/link.txt	2010-06-07 09:38:43 UTC (rev 113235)
@@ -8,7 +8,12 @@
 
 Create the browser object we'll be using.
 
-    >>> from Products.Five.testbrowser import Browser
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
+
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/metadata.txt
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/metadata.txt	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/browser/tests/metadata.txt	2010-06-07 09:38:43 UTC (rev 113235)
@@ -12,7 +12,12 @@
 
 Create the browser object we'll be using.
 
-    >>> from Products.Five.testbrowser import Browser
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
+
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/formlib/form.txt
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/formlib/form.txt	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/formlib/form.txt	2010-06-07 09:38:43 UTC (rev 113235)
@@ -8,7 +8,12 @@
 
 Create the browser object we'll be using.
 
-    >>> from Products.Five.testbrowser import Browser
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
+
     >>> browser = Browser()
     >>> browser.handleErrors = False
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -16,7 +21,13 @@
 Register the content class and factory.
 
     >>> from Products.CMFDefault.formlib.tests import CONTENT_ZCML
-    >>> from Products.Five import zcml
+
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Zope2.App import zcml
+    ... except ImportError:
+    ...     from Products.Five import zcml
+
     >>> zcml.load_string(CONTENT_ZCML)
 
 Create the type info object.

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/formlib/tests.py
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/formlib/tests.py	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/formlib/tests.py	2010-06-07 09:38:43 UTC (rev 113235)
@@ -15,10 +15,9 @@
 $Id$
 """
 
+import doctest
 import unittest
-import Testing
 from Testing import ZopeTestCase
-from zope.testing import doctest
 
 from Products.CMFCore.PortalContent import PortalContent
 from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/testing.py
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/testing.py	2010-06-07 09:37:13 UTC (rev 113234)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/testing.py	2010-06-07 09:38:43 UTC (rev 113235)
@@ -20,12 +20,17 @@
 ZopeTestCase.installProduct('CMFCore', 1)
 
 import transaction
-from Products.Five 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



More information about the checkins mailing list