[Checkins] SVN: five.localsitemanager/trunk/ Deal with deprecation warnings for Zope 2.13.

[Hanno Schlichting]

Log message for revision 113189:
  Deal with deprecation warnings for Zope 2.13.
  

Changed:
  U   five.localsitemanager/trunk/CHANGES.txt
  U   five.localsitemanager/trunk/src/five/localsitemanager/browser.txt

-=-
Modified: five.localsitemanager/trunk/CHANGES.txt
===================================================================
--- five.localsitemanager/trunk/CHANGES.txt	2010-06-06 13:31:20 UTC (rev 113188)
+++ five.localsitemanager/trunk/CHANGES.txt	2010-06-06 13:34:17 UTC (rev 113189)
@@ -4,6 +4,8 @@
 2.0.4 - unreleased
 ------------------
 
+* Deal with deprecation warnings for Zope 2.13.
+
 * Provide a more meaningful error message if the current site is not set
   correctly or the Acquisition chain of the site is messed up.
   [hannosch]

Modified: five.localsitemanager/trunk/src/five/localsitemanager/browser.txt
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/browser.txt	2010-06-06 13:31:20 UTC (rev 113188)
+++ five.localsitemanager/trunk/src/five/localsitemanager/browser.txt	2010-06-06 13:34:17 UTC (rev 113189)
@@ -14,7 +14,13 @@
 
     >>> import Products.Five
     >>> import five.localsitemanager
-    >>> from Products.Five.zcml import load_config, load_string
+
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Zope2.App.zcml import load_config, load_string
+    ... except ImportError:
+    ...     from Products.Five.zcml import load_config, load_string
+
     >>> load_config('configure.zcml', package=Products.Five)
     >>> load_config('configure.zcml', package=five.localsitemanager)
     >>> load_string('<includeOverrides package="five.localsitemanager" file="overrides.zcml" />')
@@ -32,7 +38,12 @@
 
 Create the test browser 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.addHeader('Authorization', 'Basic admin:admin')