Thu, 1 May 2003 15:36:06 -0400

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

Modified Files:
	eventsetup.py objecthubsetup.py placefulsetup.py 
	servicemanager.py test_adapter.py test_auth.py 
	test_configurationmanager.py test_connectionconfiguration.py 
	test_connectionservice.py test_eventservice.py 
	test_hookedhubevent.py test_hubevent.py test_module.py 
	test_objecthub.py test_principalannotation.py 
	test_serviceconfiguration.py test_servicemanager.py 
	test_user.py test_utility.py test_view.py test_zpt.py 
Log Message:
Importgeddon part the second. Removed unused imports throughout the
source tree. This should have taken care of most unused imports
in Zope 3. :)


=== Zope3/src/zope/app/services/tests/eventsetup.py 1.6 => 1.7 ===

--- Zope3/src/zope/app/services/tests/eventsetup.py:1.6	Wed Mar 19 14:57:32 2003
+++ Zope3/src/zope/app/services/tests/eventsetup.py	Thu May  1 15:35:35 2003
@@ -17,11 +17,7 @@
 $Id$
 """
 from zope.app.services.tests.placefulsetup import PlacefulSetup
-from zope.app.services.service import ServiceManager, ServiceConfiguration
-from zope.app.services.event import EventService
-from zope.app.traversing import traverse
-from zope.app.interfaces.services.configuration import Active
-from zope.app.interfaces.services.event import ISubscriptionService
+from zope.app.services.service import ServiceManager
 
 class EventSetup(PlacefulSetup):
 


=== Zope3/src/zope/app/services/tests/objecthubsetup.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/services/tests/objecthubsetup.py:1.9	Fri Mar 21 10:29:09 2003
+++ Zope3/src/zope/app/services/tests/objecthubsetup.py	Thu May  1 15:35:35 2003
@@ -18,14 +18,11 @@
 """
 
 from zope.app.services.tests.eventsetup import EventSetup
-from zope.component import getServiceManager, getService
+from zope.component import getService
 from zope.app.services.servicenames import HubIds
-from zope.app.services.service import ServiceConfiguration
 from zope.app.traversing import traverse, canonicalPath
 
-from zope.app.services.hub import ObjectHub
 from zope.app.interfaces.event import IObjectAddedEvent
-from zope.app.interfaces.services.configuration import Active
 from zope.app.interfaces.event import ISubscriber
 
 class LoggingSubscriber:


=== Zope3/src/zope/app/services/tests/placefulsetup.py 1.18 => 1.19 ===
--- Zope3/src/zope/app/services/tests/placefulsetup.py:1.18	Mon Mar 31 13:58:21 2003
+++ Zope3/src/zope/app/services/tests/placefulsetup.py	Thu May  1 15:35:35 2003
@@ -24,7 +24,6 @@
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.app.interfaces.container import ISimpleReadContainer
-from zope.app.interfaces.content.folder import IRootFolder
 from zope.app.interfaces.dependable import IDependable
 from zope.app.interfaces.services.configuration import Active
 from zope.app.interfaces.services.configuration import IAttributeUseConfigurable


=== Zope3/src/zope/app/services/tests/servicemanager.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/tests/servicemanager.py:1.2	Wed Dec 25 09:13:20 2002
+++ Zope3/src/zope/app/services/tests/servicemanager.py	Thu May  1 15:35:35 2003
@@ -18,8 +18,7 @@
 __metaclass__ = type
 
 from zope.component.interfaces import IServiceService
-from zope.app.component.nextservice \
-     import getNextService, getNextServiceManager
+from zope.app.component.nextservice import getNextServiceManager
 from zope.proxy.context import ContextWrapper
 from zope.app.interfaces.services.service import IBindingAware
 from zope.proxy.context import ContextMethod


=== Zope3/src/zope/app/services/tests/test_adapter.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/services/tests/test_adapter.py:1.10	Fri Apr 18 18:12:28 2003
+++ Zope3/src/zope/app/services/tests/test_adapter.py	Thu May  1 15:35:35 2003
@@ -26,7 +26,6 @@
 from zope.app.services.service import ServiceManager
 from zope.app.services.adapter import AdapterConfiguration
 from zope.app.content.folder import RootFolder
-from zope.component import getServiceManager
 from zope.app.traversing import traverse
 from zope.component.interfaces import IServiceService
 from zope.component.adapter import provideAdapter


=== Zope3/src/zope/app/services/tests/test_auth.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/services/tests/test_auth.py:1.12	Sun Mar 23 17:35:42 2003
+++ Zope3/src/zope/app/services/tests/test_auth.py	Thu May  1 15:35:35 2003
@@ -16,10 +16,8 @@
 """
 
 from unittest import TestCase, TestSuite, main, makeSuite
-from zope.app.services.auth \
-     import AuthenticationService, DuplicateLogin, DuplicateId
+from zope.app.services.auth import AuthenticationService
 from zope.app.services.auth import User
-from zope.app.interfaces.services.auth import IUser
 from zope.app.services.servicenames import Adapters, Authentication
 
 from zope.exceptions import NotFoundError
@@ -27,7 +25,7 @@
 from zope.app.services.service import ServiceConfiguration
 from zope.app.services.tests.eventsetup import EventSetup
 from zope.app.traversing import getPath, traverse
-from zope.app.interfaces.services.configuration import Active, Registered
+from zope.app.interfaces.services.configuration import Active
 
 from zope.app.container.tests.test_icontainer import BaseTestIContainer
 


=== Zope3/src/zope/app/services/tests/test_configurationmanager.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/services/tests/test_configurationmanager.py:1.7	Mon Apr 28 14:40:04 2003
+++ Zope3/src/zope/app/services/tests/test_configurationmanager.py	Thu May  1 15:35:35 2003
@@ -15,7 +15,7 @@
 $Id$
 """
 
-from unittest import TestCase, TestSuite, main, makeSuite
+from unittest import TestCase, main, makeSuite
 from zope.app.container.zopecontainer import ZopeContainerAdapter
 from zope.app.interfaces.container import IContainer
 from zope.app.interfaces.container import IDeleteNotifiable


=== Zope3/src/zope/app/services/tests/test_connectionconfiguration.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/tests/test_connectionconfiguration.py:1.8	Wed Apr 23 20:25:02 2003
+++ Zope3/src/zope/app/services/tests/test_connectionconfiguration.py	Thu May  1 15:35:35 2003
@@ -16,9 +16,7 @@
 $Id$
 """
 __metaclass__ = type
-from unittest import TestCase, TestSuite, main, makeSuite
-
-from zope.interface import Interface
+from unittest import TestCase, main, makeSuite
 
 from zope.app.services.connection import ConnectionConfiguration
 
@@ -27,7 +25,6 @@
 from zope.app.services.service import ServiceManager
 from zope.app.container.zopecontainer import ZopeContainerAdapter
 from zope.app.interfaces.services.configuration import Active, Unregistered
-from zope.app.interfaces.services.configuration import Registered
 from zope.app.interfaces.rdb import IZopeDatabaseAdapter
 from zope.app.interfaces.dependable import IDependable
 from zope.app.interfaces.rdb import IConnectionService


=== Zope3/src/zope/app/services/tests/test_connectionservice.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/services/tests/test_connectionservice.py:1.7	Wed Apr 23 20:20:44 2003
+++ Zope3/src/zope/app/services/tests/test_connectionservice.py	Thu May  1 15:35:35 2003
@@ -25,8 +25,6 @@
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.app.interfaces.dependable import IDependable
 from zope.app.interfaces.dependable import IDependable
-from zope.app.interfaces.rdb import IConnectionService
-from zope.app.interfaces.rdb import IZopeConnection
 from zope.app.interfaces.rdb import IZopeDatabaseAdapter
 from zope.app.interfaces.services.configuration import Active, Registered
 from zope.app.interfaces.services.configuration \


=== Zope3/src/zope/app/services/tests/test_eventservice.py 1.19 => 1.20 ===
--- Zope3/src/zope/app/services/tests/test_eventservice.py:1.19	Sun Mar 23 17:35:42 2003
+++ Zope3/src/zope/app/services/tests/test_eventservice.py	Thu May  1 15:35:35 2003
@@ -20,23 +20,20 @@
 from unittest import TestCase, TestLoader, TextTestRunner
 from zope.interface import Interface
 from zope.app.services.service import ServiceManager, ServiceConfiguration
-from zope.component import getServiceManager
 from zope.app.services.servicenames import EventPublication, EventSubscription
 from zope.app.services.event import EventService
 from zope.app.traversing import getPath, traverse
 from zope.exceptions import NotFoundError
 from zope.app.services.event import subscribe, unsubscribe, unsubscribeAll
-from zope.app.services.event import iterSubscriptions, getSubscriptionService
-from zope.app.event import getEventService, publish
+from zope.app.services.event import getSubscriptionService
+from zope.app.event import publish
 from zope.app.event.tests.subscriber import DummySubscriber, DummyFilter
 from zope.app.interfaces.event import IObjectEvent, IObjectModifiedEvent
 from zope.app.interfaces.event import IObjectRemovedEvent, IObjectAddedEvent
 from zope.app.interfaces.event import ISubscriber
 from zope.app.event.objectevent import ObjectAddedEvent, ObjectModifiedEvent
-from zope.app.event.globalservice import GlobalEventPublisher
 from zope.app.interfaces.event import IEvent, ISubscribingAware
 from zope.app.interfaces.services.configuration import Active
-from zope.app.interfaces.services.configuration import Unregistered
 from zope.app.interfaces.services.configuration import Registered
 from zope.proxy.context import ContextWrapper
 from zope.app.services.tests.eventsetup import EventSetup


=== Zope3/src/zope/app/services/tests/test_hookedhubevent.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/tests/test_hookedhubevent.py:1.5	Wed Mar 19 14:57:32 2003
+++ Zope3/src/zope/app/services/tests/test_hookedhubevent.py	Thu May  1 15:35:35 2003
@@ -21,14 +21,12 @@
 # ObjectHub, which makes these tests less pure...but still useful
 # as a test for both the events and the object hub for now.
 
-import unittest, sys
+import unittest
 from zope.app.services.tests.objecthubsetup import ObjectHubSetup
 from zope.app.services.hub import \
      ObjectRegisteredHubEvent, ObjectUnregisteredHubEvent, \
      ObjectModifiedHubEvent, ObjectMovedHubEvent, ObjectRemovedHubEvent
 from zope.app.traversing import getPath
-
-from zope.component import getService
 
 class AbstractTestHubEvent(ObjectHubSetup, unittest.TestCase):
 


=== Zope3/src/zope/app/services/tests/test_hubevent.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/tests/test_hubevent.py:1.3	Wed Mar 19 13:05:04 2003
+++ Zope3/src/zope/app/services/tests/test_hubevent.py	Thu May  1 15:35:35 2003
@@ -17,7 +17,7 @@
 $Id$
 """
 
-import unittest, sys
+import unittest
 
 from zope.app.services.hub import \
      ObjectRegisteredHubEvent, ObjectUnregisteredHubEvent, \


=== Zope3/src/zope/app/services/tests/test_module.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/tests/test_module.py:1.5	Sun Mar 23 17:35:42 2003
+++ Zope3/src/zope/app/services/tests/test_module.py	Thu May  1 15:35:35 2003
@@ -19,19 +19,9 @@
 from unittest import TestCase, TestLoader, TextTestRunner
 
 from zope.interface import Interface
-from zope.app.content.folder import RootFolder
-from zope.app.content.folder import Folder
-from zope.proxy.context import getWrapperContext, getWrapperContainer
 from zope.app.services.service import ServiceManager
-from zope.app.services.service import ServiceConfiguration
-from zope.component import getService, getServiceManager
-from zope.exceptions import ZopeError
 from zope.app.services.tests.placefulsetup import PlacefulSetup
 from zope.app.traversing import traverse
-from zope.app.interfaces.services.configuration import Active, Unregistered
-from zope.app.interfaces.services.configuration import Registered
-from zope.component.service import serviceManager
-from zope.proxy.context import ContextWrapper as cw
 from zope.app.services.module import Manager
 from zodb.storage.mapping import MappingStorage
 from zodb.db import DB


=== Zope3/src/zope/app/services/tests/test_objecthub.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/tests/test_objecthub.py:1.8	Mon Mar 24 11:42:21 2003
+++ Zope3/src/zope/app/services/tests/test_objecthub.py	Thu May  1 15:35:35 2003
@@ -17,7 +17,7 @@
 $Id$
 """
 
-import unittest, sys
+import unittest
 from zope.app.services.tests.objecthubsetup import ObjectHubSetup
 
 from zope.app.interfaces.event\
@@ -38,9 +38,8 @@
         ObjectUnregisteredHubEvent
 
 from zope.exceptions import NotFoundError
-from types import StringTypes
 
-from zope.app.traversing import traverse, canonicalPath
+from zope.app.traversing import canonicalPath
 
 # while these tests don't really test much of the placeful aspect of the
 # object hub, they do at least test basic functionality.


=== Zope3/src/zope/app/services/tests/test_principalannotation.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/tests/test_principalannotation.py:1.2	Wed Dec 25 09:13:20 2002
+++ Zope3/src/zope/app/services/tests/test_principalannotation.py	Thu May  1 15:35:35 2003
@@ -20,8 +20,10 @@
 from zope.app.services.tests.placefulsetup \
     import PlacefulSetup
 from zope.component import getServiceManager, getService
-from zope.app.services.principalannotation import PrincipalAnnotationService, Annotations, AnnotationsForPrincipal
-from zope.app.interfaces.services.principalannotation import IPrincipalAnnotationService
+from zope.app.services.principalannotation import \
+     PrincipalAnnotationService, AnnotationsForPrincipal
+from zope.app.interfaces.services.principalannotation import \
+     IPrincipalAnnotationService
 from zope.component.adapter import provideAdapter
 from zope.component import getAdapter
 from zope.app.interfaces.annotation import IAnnotations


=== Zope3/src/zope/app/services/tests/test_serviceconfiguration.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/tests/test_serviceconfiguration.py:1.8	Sun Mar 23 17:35:42 2003
+++ Zope3/src/zope/app/services/tests/test_serviceconfiguration.py	Thu May  1 15:35:35 2003
@@ -18,7 +18,7 @@
 $Id$
 """
 
-from unittest import TestCase, TestSuite, main, makeSuite
+from unittest import TestCase, main, makeSuite
 
 from zope.interface import Interface
 
@@ -29,7 +29,7 @@
 from zope.app.services.service import ServiceManager
 from zope.component.service import defineService
 from zope.app.interfaces.services.service import IBindingAware
-from zope.app.interfaces.services.configuration import Active, Unregistered
+from zope.app.interfaces.services.configuration import Active
 from zope.app.interfaces.services.configuration import Registered
 from zope.app.interfaces.services.configuration import IUseConfiguration
 from zope.app.interfaces.services.service import ISimpleService


=== Zope3/src/zope/app/services/tests/test_servicemanager.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/services/tests/test_servicemanager.py:1.7	Mon Mar 24 06:09:40 2003
+++ Zope3/src/zope/app/services/tests/test_servicemanager.py	Thu May  1 15:35:35 2003
@@ -19,13 +19,10 @@
 from unittest import TestCase, TestLoader, TextTestRunner
 
 from zope.interface import Interface
-from zope.app.content.folder import RootFolder
-from zope.app.content.folder import Folder
-from zope.proxy.context import getWrapperContext, getWrapperContainer
+from zope.proxy.context import getWrapperContainer
 from zope.app.services.service import ServiceManager
 from zope.app.services.service import ServiceConfiguration
 from zope.component import getService, getServiceManager
-from zope.exceptions import ZopeError
 from zope.app.services.tests.placefulsetup import PlacefulSetup
 from zope.app.traversing import traverse
 from zope.app.interfaces.services.configuration import Active, Unregistered


=== Zope3/src/zope/app/services/tests/test_user.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/tests/test_user.py:1.2	Wed Dec 25 09:13:20 2002
+++ Zope3/src/zope/app/services/tests/test_user.py	Thu May  1 15:35:35 2003
@@ -15,7 +15,7 @@
 $Id$
 """
 
-from unittest import TestCase, TestSuite, main, makeSuite
+from unittest import TestCase, main, makeSuite
 from zope.app.services.auth import User
 
 class UserTest(TestCase):


=== Zope3/src/zope/app/services/tests/test_utility.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/services/tests/test_utility.py:1.4	Tue Apr 29 12:37:39 2003
+++ Zope3/src/zope/app/services/tests/test_utility.py	Thu May  1 15:35:35 2003
@@ -25,7 +25,7 @@
 from zope.interface import Interface
 from zope.component import getService
 from zope.component.exceptions import ComponentLookupError
-from zope.app.traversing import traverse, getPath
+from zope.app.traversing import traverse
 from zope.app.interfaces.services.configuration import IConfigurationRegistry
 from zope.app.interfaces.services.configuration \
      import Active, Registered, Unregistered


=== Zope3/src/zope/app/services/tests/test_view.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/services/tests/test_view.py:1.10	Fri Apr 18 18:12:28 2003
+++ Zope3/src/zope/app/services/tests/test_view.py	Thu May  1 15:35:35 2003
@@ -26,7 +26,6 @@
 from zope.app.services.service import ServiceManager
 from zope.app.services.view import ViewConfiguration
 from zope.app.content.folder import RootFolder
-from zope.component import getServiceManager
 from zope.app.traversing import traverse
 from zope.component.interfaces import IServiceService
 from zope.component.view import provideView


=== Zope3/src/zope/app/services/tests/test_zpt.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/tests/test_zpt.py:1.3	Wed Apr  2 14:48:21 2003
+++ Zope3/src/zope/app/services/tests/test_zpt.py	Thu May  1 15:35:35 2003
@@ -15,7 +15,7 @@
 $Id$
 """
 
-from unittest import TestCase, TestSuite, main, makeSuite
+from unittest import TestCase, TestSuite, makeSuite
 import zope.app.services.zpt
 from zope.publisher.browser import BrowserView, TestRequest
 



