[Checkins] SVN: five.formlib/trunk/ Avoid deprecation warnings under Zope 2.13.

[Hanno Schlichting]

Log message for revision 113217:
  Avoid deprecation warnings under Zope 2.13.
  

Changed:
  U   five.formlib/trunk/CHANGES.txt
  U   five.formlib/trunk/src/five/formlib/tests/formlib.txt
  U   five.formlib/trunk/src/five/formlib/tests/forms.txt
  U   five.formlib/trunk/src/five/formlib/tests/test_formlib.py

-=-
Modified: five.formlib/trunk/CHANGES.txt
===================================================================
--- five.formlib/trunk/CHANGES.txt	2010-06-06 18:56:56 UTC (rev 113216)
+++ five.formlib/trunk/CHANGES.txt	2010-06-06 18:57:11 UTC (rev 113217)
@@ -4,6 +4,7 @@
 1.0.3 - unreleased
 ------------------
 
+* Avoid deprecation warnings under Zope 2.13.
 
 1.0.2 - 2009-12-30
 ------------------

Modified: five.formlib/trunk/src/five/formlib/tests/formlib.txt
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/formlib.txt	2010-06-06 18:56:56 UTC (rev 113216)
+++ five.formlib/trunk/src/five/formlib/tests/formlib.txt	2010-06-06 18:57:11 UTC (rev 113217)
@@ -16,7 +16,12 @@
 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 @@
 
 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')

Modified: five.formlib/trunk/src/five/formlib/tests/forms.txt
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/forms.txt	2010-06-06 18:56:56 UTC (rev 113216)
+++ five.formlib/trunk/src/five/formlib/tests/forms.txt	2010-06-06 18:57:11 UTC (rev 113217)
@@ -9,7 +9,12 @@
 
 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 @@
 
 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')
 

Modified: five.formlib/trunk/src/five/formlib/tests/test_formlib.py
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/test_formlib.py	2010-06-06 18:56:56 UTC (rev 113216)
+++ five.formlib/trunk/src/five/formlib/tests/test_formlib.py	2010-06-06 18:57:11 UTC (rev 113217)
@@ -27,8 +27,12 @@
 
     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...