[Checkins] SVN: zope.app.workflow/trunk/src/zope/app/workflow/ Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302

[Lorenzo Gil]

Log message for revision 85791:
  Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302

Changed:
  U   zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_contentworkflowsmanager.py
  U   zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_processdefinition.py
  U   zope.app.workflow/trunk/src/zope/app/workflow/stateful/definition.py
  U   zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_contentworkflow.py
  U   zope.app.workflow/trunk/src/zope/app/workflow/tests/workflowsetup.py

-=-
Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_contentworkflowsmanager.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_contentworkflowsmanager.py	2008-04-27 14:09:36 UTC (rev 85790)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_contentworkflowsmanager.py	2008-04-27 18:40:59 UTC (rev 85791)
@@ -13,7 +13,7 @@
 ##############################################################################
 """Functional Tests for ContentWorkflowsManager
 
-$Id$   
+$Id$
 """
 import unittest
 import re
@@ -21,8 +21,8 @@
 from transaction import commit
 from zope.interface import Interface
 from zope.component.interface import nameToInterface
+from zope.traversing.api import traverse
 
-from zope.app import zapi
 from zope.app.testing.functional import BrowserTestCase
 from zope.app.testing.setup import addUtility
 
@@ -38,12 +38,12 @@
         self.basepath = '/++etc++site/default'
         root = self.getRootFolder()
 
-        sm = zapi.traverse(root, '/++etc++site')
+        sm = traverse(root, '/++etc++site')
         addUtility(sm,
                    'dummy-definition',
                    IStatefulProcessDefinition,
                    StatefulProcessDefinition()
-                   ) 
+                   )
         commit()
 
         response = self.publish(
@@ -67,10 +67,10 @@
         body = ' '.join(response.getBody().split())
         self.assert_(body.find(
             '<option value="zope.app.folder.interfaces.IFolder">'
-            ) >= 0)        
+            ) >= 0)
         self.assert_(body.find(
             '<option value="zope.app.file.interfaces.IFile">'
-            ) >= 0)        
+            ) >= 0)
 
         response = self.publish(
             self.basepath + '/mgr/index.html',
@@ -84,7 +84,7 @@
 
         self.assertEqual(response.getStatus(), 200)
         root = self.getRootFolder()
-        mgr = zapi.traverse(root, self.basepath+'/mgr')
+        mgr = traverse(root, self.basepath+'/mgr')
         ifaces = mgr.getInterfacesForProcessName('dummy-definition')
 
         self.assert_(nameToInterface(

Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_processdefinition.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_processdefinition.py	2008-04-27 14:09:36 UTC (rev 85790)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_processdefinition.py	2008-04-27 18:40:59 UTC (rev 85791)
@@ -18,7 +18,6 @@
 import unittest
 import re
 
-from zope.app import zapi
 from zope.app.testing.functional import BrowserTestCase
 from zope.app.workflow.stateful.definition import StatefulProcessDefinition
 from zope.app.workflow.testing import AppWorkflowLayer

Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/definition.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/definition.py	2008-04-27 14:09:36 UTC (rev 85790)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/definition.py	2008-04-27 18:40:59 UTC (rev 85791)
@@ -25,6 +25,7 @@
 from zope.event import notify
 from zope.component.interfaces import ObjectEvent
 from zope.lifecycleevent import modified
+from zope.traversing.api import getParents
 
 from zope.app.container.interfaces import IReadContainer
 from zope.app.container.contained import Contained, containedEvent
@@ -50,8 +51,8 @@
 
 class NoLocalProcessDefinition(Exception):
     """No local process definition found"""
-    
 
+
 class StateNamesVocabulary(SimpleVocabulary):
     """Vocabulary providing the names of states in a local process definition.
     """
@@ -65,7 +66,7 @@
         if hasattr(context, 'getProcessDefinition'):
             return context.getProcessDefinition().getStateNames()
         else:
-            for obj in zapi.getParents(context):
+            for obj in getParents(context):
                 if IStatefulProcessDefinition.providedBy(obj):
                     return obj.getStateNames()
         raise NoLocalProcessDefinition('No local process definition found.')

Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_contentworkflow.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_contentworkflow.py	2008-04-27 14:09:36 UTC (rev 85790)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_contentworkflow.py	2008-04-27 18:40:59 UTC (rev 85791)
@@ -23,8 +23,8 @@
 from zope.annotation.interfaces import IAnnotatable, IAttributeAnnotatable
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.lifecycleevent.interfaces import IObjectCreatedEvent
+from zope.traversing.api import traverse
 
-from zope.app import zapi
 from zope.app.container.contained import Contained
 
 from zope.app.workflow.interfaces import IProcessDefinition
@@ -94,7 +94,7 @@
         manager = ContentWorkflowsManager()
         manager._registry = {IFace1: ('default',), IFace2: ('default',)}
         self.default['manager'] = manager
-        return zapi.traverse(self.default, 'manager')
+        return traverse(self.default, 'manager')
 
     def test_getProcessDefinitionNamesForObject(self):
         manager = self.getManager()

Modified: zope.app.workflow/trunk/src/zope/app/workflow/tests/workflowsetup.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/tests/workflowsetup.py	2008-04-27 14:09:36 UTC (rev 85790)
+++ zope.app.workflow/trunk/src/zope/app/workflow/tests/workflowsetup.py	2008-04-27 18:40:59 UTC (rev 85791)
@@ -15,9 +15,10 @@
 
 $Id$
 """
+from zope.component import getGlobalSiteManager
 from zope.interface import implements
+from zope.traversing.api import traverse
 
-from zope.app import zapi
 from zope.app.security.principalregistry import principalRegistry
 from zope.app.component.testing import PlacefulSetup
 from zope.app.testing import setup
@@ -26,12 +27,12 @@
 class WorkflowSetup(PlacefulSetup):
 
     def setUp(self):
-        self.root_sm = zapi.getGlobalSiteManager()
+        self.root_sm = getGlobalSiteManager()
 
         self.sm = PlacefulSetup.setUp(self, site=True)
-        self.default = zapi.traverse(self.sm, "default")
+        self.default = traverse(self.sm, "default")
         self.cm = self.default.registrationManager
 
         self.sm1 = self.makeSite('folder1')
-        self.default1 = zapi.traverse(self.sm1, "default")
+        self.default1 = traverse(self.sm1, "default")
         self.cm1 = self.default1.registrationManager