[Checkins] SVN: Products.CMFDefault/branches/2.2/Products/CMFDefault/ Backport c113202 from trunk
Hanno Schlichting
hannosch at hannosch.eu
Sun Jun 6 09:58:37 EDT 2010
Log message for revision 113203:
Backport c113202 from trunk
Changed:
U Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt
U Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/btreefolder.txt
U Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/document.txt
U Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/favorite.txt
U Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/file.txt
U Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/folder.txt
U Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/link.txt
U Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/metadata.txt
U Products.CMFDefault/branches/2.2/Products/CMFDefault/formlib/form.txt
U Products.CMFDefault/branches/2.2/Products/CMFDefault/testing.py
-=-
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt 2010-06-06 13:56:56 UTC (rev 113202)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt 2010-06-06 13:58:37 UTC (rev 113203)
@@ -4,6 +4,8 @@
2.2.1-beta (unreleased)
-----------------------
+- Deal with deprecation warnings for Zope 2.13.
+
- Use the standard libraries doctest module.
- upgrade: Added 2 more upgrade steps for upgrades from CMF 2.0.
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/btreefolder.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/btreefolder.txt 2010-06-06 13:56:56 UTC (rev 113202)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/btreefolder.txt 2010-06-06 13:58:37 UTC (rev 113203)
@@ -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/2.2/Products/CMFDefault/browser/tests/document.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/document.txt 2010-06-06 13:56:56 UTC (rev 113202)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/document.txt 2010-06-06 13:58:37 UTC (rev 113203)
@@ -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/2.2/Products/CMFDefault/browser/tests/favorite.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/favorite.txt 2010-06-06 13:56:56 UTC (rev 113202)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/favorite.txt 2010-06-06 13:58:37 UTC (rev 113203)
@@ -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/2.2/Products/CMFDefault/browser/tests/file.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/file.txt 2010-06-06 13:56:56 UTC (rev 113202)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/file.txt 2010-06-06 13:58:37 UTC (rev 113203)
@@ -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/2.2/Products/CMFDefault/browser/tests/folder.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/folder.txt 2010-06-06 13:56:56 UTC (rev 113202)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/folder.txt 2010-06-06 13:58:37 UTC (rev 113203)
@@ -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/2.2/Products/CMFDefault/browser/tests/link.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/link.txt 2010-06-06 13:56:56 UTC (rev 113202)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/link.txt 2010-06-06 13:58:37 UTC (rev 113203)
@@ -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/2.2/Products/CMFDefault/browser/tests/metadata.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/metadata.txt 2010-06-06 13:56:56 UTC (rev 113202)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/metadata.txt 2010-06-06 13:58:37 UTC (rev 113203)
@@ -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/2.2/Products/CMFDefault/formlib/form.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/formlib/form.txt 2010-06-06 13:56:56 UTC (rev 113202)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/formlib/form.txt 2010-06-06 13:58:37 UTC (rev 113203)
@@ -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/2.2/Products/CMFDefault/testing.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/testing.py 2010-06-06 13:56:56 UTC (rev 113202)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/testing.py 2010-06-06 13:58:37 UTC (rev 113203)
@@ -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