Author: bree
Date: Thu Feb 2 09:07:30 2006
New Revision: 2266
Modified:
azax/branches/snowsprint/tests/test_azaxview.py
Log:
test code import changing
Modified: azax/branches/snowsprint/tests/test_azaxview.py
==============================================================================
--- azax/branches/snowsprint/tests/test_azaxview.py (original)
+++ azax/branches/snowsprint/tests/test_azaxview.py Thu Feb 2 09:07:30 2006
@@ -28,8 +28,6 @@
from Globals import InitializeClass
from OFS.SimpleItem import SimpleItem
from zope.publisher.browser import TestRequest
-import Products.Five
-from Products.Five.zcml import load_string, load_config
from textwrap import dedent
# Fake content
@@ -52,22 +50,29 @@
fakerequest = TestRequest()
self.view = AzaxBaseView(fakecontent, fakerequest)
# Allow traversing
- load_config('meta.zcml', package=Products.Five)
- load_string(dedent('''\
- <configure xmlns="http://namespaces.zope.org/zope";
- xmlns:five="http://namespaces.zope.org/five";>
- <include package="zope.app.traversing" />
- <adapter
- for="*"
- factory="Products.Five.traversable.FiveTraversable"
-
provides="zope.app.traversing.interfaces.ITraversable"
- />
- <!--adapter
- for="*"
- factory="zope.app.traversing.adapters.Traverser"
- provides="zope.app.traversing.interfaces.ITraverser"
- /-->
- </configure>'''))
+ try:
+ import Products.Five
+ except ImportError:
+ # probably zope 3
+ pass
+ else:
+ from Products.Five.zcml import load_string, load_config
+ load_config('meta.zcml', package=Products.Five)
+ load_string(dedent('''\
+ <configure xmlns="http://namespaces.zope.org/zope";
+ xmlns:five="http://namespaces.zope.org/five";>
+ <include package="zope.app.traversing" />
+ <adapter
+ for="*"
+
factory="Products.Five.traversable.FiveTraversable"
+
provides="zope.app.traversing.interfaces.ITraversable"
+ />
+ <!--adapter
+ for="*"
+ factory="zope.app.traversing.adapters.Traverser"
+
provides="zope.app.traversing.interfaces.ITraverser"
+ /-->
+ </configure>'''))
class TestAzaxView(AzaxViewTestCase):
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
