Avoid deprecation warnings under Zope 2.13.

zopefoundation · Jun 6, 2010 · 5f59ca2 · 5f59ca2
1 parent 0548e5b
commit 5f59ca2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,7 @@ Changelog
 1.0.3 - unreleased
 ------------------
 
+* Avoid deprecation warnings under Zope 2.13.
 
 1.0.2 - 2009-12-30
 ------------------

diff --git a/src/five/formlib/tests/formlib.txt b/src/five/formlib/tests/formlib.txt
@@ -16,7 +16,12 @@ account:
 We need to configure all of Five and the necessary formlib components for
 this test:
 
-  >>> from Products.Five import zcml
+  # BBB for Zope 2.12
+  >>> try:
+  ...     from Zope2.App import zcml
+  ... except ImportError:
+  ...     from Products.Five import zcml
+
   >>> import Products.Five
   >>> zcml.load_config('meta.zcml', Products.Five)
   >>> import five.formlib
@@ -33,7 +38,12 @@ to to do its view lookup:
 
 Let's set up a testbrowser:
 
-  >>> 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.addHeader('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7')
   >>> browser.addHeader('Accept-Language', 'en-US')

diff --git a/src/five/formlib/tests/forms.txt b/src/five/formlib/tests/forms.txt
@@ -9,7 +9,12 @@ manager account:
 
 We need to configure all of Five for the functional test:
 
-  >>> from Products.Five import zcml
+  # BBB for Zope 2.12
+  >>> try:
+  ...     from Zope2.App import zcml
+  ... except ImportError:
+  ...     from Products.Five import zcml
+
   >>> import Products.Five
   >>> zcml.load_config('meta.zcml', Products.Five)
   >>> import five.formlib
@@ -26,7 +31,12 @@ get to to do its view lookup:
 
 Let's set up a testbrowser:
 
-  >>> 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.addHeader('Accept-Language', 'en-US')
 

diff --git a/src/five/formlib/tests/test_formlib.py b/src/five/formlib/tests/test_formlib.py
@@ -27,8 +27,12 @@ def test_get_widgets_for_schema_fields():
 
     First, load the configuration files:
 
-      >>> import Products.Five
-      >>> 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_config('configure.zcml', Products.Five)
 
     Now for some actual testing...