[Zope3-checkins] CVS: Zope3/src/zope/app/workflow/tests - directive_helpers.py:1.2 test_definition.py:1.2 test_directives.py:1.2 test_importexport.py:1.2 test_service.py:1.3 workflowsetup.py:1.4

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/workflow/tests
In directory cvs.zope.org:/tmp/cvs-serv6144/src/zope/app/workflow/tests

Modified Files:
	directive_helpers.py test_definition.py test_directives.py 
	test_importexport.py test_service.py workflowsetup.py 
Log Message:
After cleaning up placefull test setup (see earlier checkins)
cleaned up unneeded imports in test modules (and some other modules)
based on the results of running Martijn Faassen's importchecker tool.


=== Zope3/src/zope/app/workflow/tests/directive_helpers.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/workflow/tests/directive_helpers.py:1.1	Thu May  8 13:27:20 2003
+++ Zope3/src/zope/app/workflow/tests/directive_helpers.py	Tue Jun  3 18:46:24 2003
@@ -15,7 +15,6 @@
 __metaclass__ = type
 
 from zope.app.interfaces.workflow import IProcessDefinition
-from zope.app.interfaces.workflow import IGlobalProcessDefinitionImportExport
 from zope.app.interfaces.workflow import IProcessDefinitionImportHandler
 from zope.app.interfaces.workflow import IProcessDefinitionExportHandler
 


=== Zope3/src/zope/app/workflow/tests/test_definition.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/workflow/tests/test_definition.py:1.1	Thu May  8 13:27:20 2003
+++ Zope3/src/zope/app/workflow/tests/test_definition.py	Tue Jun  3 18:46:24 2003
@@ -14,7 +14,6 @@
 
 import unittest
 
-from zope.interface import Interface
 from zope.interface.verify import verifyClass
 
 from zope.app.interfaces.workflow import IProcessDefinition


=== Zope3/src/zope/app/workflow/tests/test_directives.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/workflow/tests/test_directives.py:1.1	Thu May  8 13:27:20 2003
+++ Zope3/src/zope/app/workflow/tests/test_directives.py	Tue Jun  3 18:46:24 2003
@@ -13,8 +13,6 @@
 ##############################################################################
 
 import unittest
-import sys
-import os
 from cStringIO import StringIO
 
 from zope.app.tests.placelesssetup import PlacelessSetup


=== Zope3/src/zope/app/workflow/tests/test_importexport.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/workflow/tests/test_importexport.py:1.1	Thu May  8 13:27:20 2003
+++ Zope3/src/zope/app/workflow/tests/test_importexport.py	Tue Jun  3 18:46:24 2003
@@ -13,9 +13,6 @@
 ##############################################################################
 
 import unittest
-import sys
-import os
-from cStringIO import StringIO
 
 from zope.app.tests.placelesssetup import PlacelessSetup
 


=== Zope3/src/zope/app/workflow/tests/test_service.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/workflow/tests/test_service.py:1.2	Tue Jun  3 10:36:13 2003
+++ Zope3/src/zope/app/workflow/tests/test_service.py	Tue Jun  3 18:46:24 2003
@@ -19,15 +19,14 @@
 
 import unittest
 
-from zope.interface import Interface, implements
+from zope.app import zapi
+from zope.interface import implements
 from zope.interface.verify import verifyClass
 
-from zope.app.traversing import traverse
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.app.interfaces.services.configuration import IUseConfigurable
 
-from zope.app.interfaces.services.configuration \
-     import Active, Unregistered, Registered
+from zope.app.interfaces.services.configuration import Active, Registered
 
 from zope.app.workflow.tests.workflowsetup import WorkflowSetup
 from zope.app.interfaces.workflow \
@@ -64,13 +63,15 @@
 
         self.cm.setObject('', ProcessDefinitionConfiguration('definition1',
                                 '/++etc++site/default/pd1'))
-        traverse(self.default.getConfigurationManager(), '2').status = Active
+        zapi.traverse(self.default.getConfigurationManager(),
+                      '2').status = Active
         self.cm.setObject('', ProcessDefinitionConfiguration('definition2',
                                 '/++etc++site/default/pd2'))
-        traverse(self.default.getConfigurationManager(), '3').status = Active
+        zapi.traverse(self.default.getConfigurationManager(),
+                      '3').status = Active
         self.cm.setObject('', ProcessDefinitionConfiguration('definition3',
                                 '/++etc++site/default/pd1'))
-        traverse(self.default.getConfigurationManager(),
+        zapi.traverse(self.default.getConfigurationManager(),
                  '4').status = Registered
         # Now self.service has definition1 and definition2 available
         # and knows about definition3
@@ -80,10 +81,12 @@
 
         self.cm1.setObject('', ProcessDefinitionConfiguration('definition1',
                             '/folder1/++etc++site/default/pd3'))
-        traverse(self.default1.getConfigurationManager(), '2').status = Active
+        zapi.traverse(self.default1.getConfigurationManager(),
+                      '2').status = Active
         self.cm1.setObject('', ProcessDefinitionConfiguration('definition4',
                             '/folder1/++etc++site/default/pd4'))
-        traverse(self.default1.getConfigurationManager(), '3').status = Active
+        zapi.traverse(self.default1.getConfigurationManager(),
+                      '3').status = Active
         # Now self.service1 overrides definition1, adds new definition4
         # available, and inherits definition2 from self.service
 


=== Zope3/src/zope/app/workflow/tests/workflowsetup.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/workflow/tests/workflowsetup.py:1.3	Tue Jun  3 17:43:02 2003
+++ Zope3/src/zope/app/workflow/tests/workflowsetup.py	Tue Jun  3 18:46:24 2003
@@ -16,11 +16,9 @@
 Revision information:
 $Id$
 """
-from zope.app.services.service import ServiceManager
-from zope.app.services.service import ServiceConfiguration
 
 from zope.component import getService, getServiceManager
-from zope.app.services.servicenames import Roles, Permissions, Adapters
+from zope.app.services.servicenames import Roles, Permissions
 from zope.app.services.servicenames import Authentication, Workflows
 
 from zope.app.interfaces.security import IAuthenticationService
@@ -29,21 +27,8 @@
 from zope.app.security.registries.principalregistry import principalRegistry
 from zope.app.security.registries.permissionregistry import permissionRegistry
 
-from zope.app.interfaces.dependable import IDependable
 from zope.app.services.tests.placefulsetup import PlacefulSetup
-from zope.app.interfaces.annotation import IAnnotatable
 from zope.app.interfaces.annotation import IAttributeAnnotatable
-from zope.app.attributeannotations import AttributeAnnotations
-from zope.app.interfaces.annotation import IAnnotations
-from zope.app.interfaces.dependable import IDependable
-from zope.app.dependable import Dependable
-from zope.app.interfaces.services.configuration \
-     import IUseConfiguration, IUseConfigurable
-from zope.app.services.configuration import UseConfiguration
-from zope.component.adapter import provideAdapter
-
-from zope.app.interfaces.services.configuration \
-     import Active, Unregistered, Registered
 
 from zope.app.workflow.service import WorkflowService