r13381 - in MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk: docs src/archetypes/referencebrowserwidget/tests

Author: tom_gross
Date: Wed Dec 22 14:16:59 2010
New Revision: 13381

Modified:
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/base.py
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/reference_access.txt
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/test_product.py
Log:
Don't issue deprecation-warnings on Zope 2.13


Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/docs/HISTORY.txt	Wed Dec 22 14:16:59 2010
@@ -4,6 +4,9 @@
 2.1 - (svn/unreleased)
 ----------------------
 
+* Don't issue deprecation-warnings on Zope 2.13
+  [tom_gross]
+
 * Fixed title display for images with preview
   http://dev.plone.org/plone/ticket/11290
   [tom_gross] 

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/base.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/base.py	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/base.py	Wed Dec 22 14:16:59 2010
@@ -1,6 +1,9 @@
 from zope.component import getMultiAdapter
 
-from Products.Five import zcml
+try:
+    from Zope2.App import zcml  # Zope >= 2.13
+except ImportError:
+    from Products.Five import zcml  # Zope < 2.13
 from Products.Five import fiveconfigure
 from Testing import ZopeTestCase as ztc
 

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/reference_access.txt
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/reference_access.txt	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/reference_access.txt	Wed Dec 22 14:16:59 2010
@@ -43,7 +43,10 @@
 
 Fred logs in and visits the context and both targets. He has no access to either:
 
-  >>> from Products.Five.testbrowser import Browser
+  >>> try:
+  ...     from Testing.testbrowser import Browser
+  ... except ImportError:
+  ...     from Products.Five.testbrowser import Browser
   >>> browser = Browser()
   >>> browser.addHeader('Authorization', 'Basic %s:%s' % ('fred', 'secret'))
   >>> browser.open(context.absolute_url())

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/test_product.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/test_product.py	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/tests/test_product.py	Wed Dec 22 14:16:59 2010
@@ -10,7 +10,10 @@
 
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.Five import BrowserView
-from Products.Five.testbrowser import Browser
+try:
+    from Testing.testbrowser import Browser  # Zope >= 2.13
+except ImportError:
+    from Products.Five.testbrowser import Browser  # Zope < 2.13
 
 from plone.app.form._named import named_template_adapter
 from plone.app.layout.navigation.interfaces import INavigationRoot

------------------------------------------------------------------------------
Forrester recently released a report on the Return on Investment (ROI) of
Google Apps. They found a 300% ROI, 38%-56% cost savings, and break-even
within 7 months.  Over 3 million businesses have gone Google with Google Apps:
an online email calendar, and document program that's accessible from your 
browser. Read the Forrester report: http://p.sf.net/sfu/googleapps-sfnew