[Zope3-checkins] CVS: Zope3/src/zope/app/services - auth.py:1.15 cache.py:1.9 configuration.py:1.26 connection.py:1.11 event.py:1.23 folder.py:1.6 hub.py:1.10 interface.py:1.4 pagefolder.py:1.5 service.py:1.18 utility.py:1.6 zpt.py:1.10
Martijn Faassen
m.faassen@vet.uu.nl
Thu, 1 May 2003 15:36:05 -0400
Update of /cvs-repository/Zope3/src/zope/app/services
In directory cvs.zope.org:/tmp/cvs-serv30407/zope/app/services
Modified Files:
auth.py cache.py configuration.py connection.py event.py
folder.py hub.py interface.py pagefolder.py service.py
utility.py 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/auth.py 1.14 => 1.15 ===
--- Zope3/src/zope/app/services/auth.py:1.14 Tue Mar 11 11:11:22 2003
+++ Zope3/src/zope/app/services/auth.py Thu May 1 15:35:34 2003
@@ -16,8 +16,6 @@
$Id$
"""
-from types import TupleType
-
from persistence import Persistent
from zodb.btrees.OOBTree import OOBTree
@@ -34,7 +32,6 @@
from zope.proxy.introspection import removeAllProxies
from zope.app.attributeannotations import AttributeAnnotations
-from zope.app.security.grants.principalrole import principalRoleManager
from zope.app.component.nextservice import getNextService
from zope.proxy.context import ContextMethod
from zope.app.interfaces.services.service import ISimpleService
=== Zope3/src/zope/app/services/cache.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/cache.py:1.8 Mon Apr 28 11:21:08 2003
+++ Zope3/src/zope/app/services/cache.py Thu May 1 15:35:34 2003
@@ -18,7 +18,7 @@
from persistence import Persistent
-from zope.component import getAdapter, getService
+from zope.component import getService
from zope.proxy.context import ContextMethod
from zope.app.component.nextservice import queryNextService
@@ -26,14 +26,13 @@
from zope.app.interfaces.event import IObjectModifiedEvent
from zope.app.interfaces.services.cache import ICacheConfiguration
from zope.app.interfaces.services.configuration \
- import INameComponentConfigurable, IUseConfiguration
+ import INameComponentConfigurable
from zope.app.interfaces.services.event import IEventChannel
from zope.app.interfaces.services.service import ISimpleService
from zope.app.services.configuration import ConfigurationStatusProperty
from zope.app.services.configuration import NameComponentConfigurable
from zope.app.services.configuration import NamedComponentConfiguration
from zope.app.services.event import ServiceSubscriberEventChannel
-from zope.app.traversing import getPath
class ILocalCachingService(ICachingService, IEventChannel,
INameComponentConfigurable):
=== Zope3/src/zope/app/services/configuration.py 1.25 => 1.26 ===
--- Zope3/src/zope/app/services/configuration.py:1.25 Wed Apr 30 14:20:45 2003
+++ Zope3/src/zope/app/services/configuration.py Thu May 1 15:35:34 2003
@@ -45,7 +45,7 @@
from zope.app.traversing import getRoot, getPath, traverse
from zope.app.traversing import canonicalPath
from zope.component import getAdapter, queryAdapter
-from zope.component import getService, queryService, getServiceManager
+from zope.component import getServiceManager
from zope.proxy.context import ContextMethod, ContextWrapper
from zope.proxy.context import ContextDescriptor
from zope.proxy.introspection import removeAllProxies
=== Zope3/src/zope/app/services/connection.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/services/connection.py:1.10 Mon Apr 28 11:21:08 2003
+++ Zope3/src/zope/app/services/connection.py Thu May 1 15:35:34 2003
@@ -17,16 +17,13 @@
from persistence import Persistent
from zope.proxy.context import ContextMethod
-from zope.component import getAdapter
from zope.app.interfaces.rdb import IZopeDatabaseAdapter
-from zope.app.interfaces.services.configuration import IUseConfiguration
from zope.app.interfaces.services.connection import ILocalConnectionService
from zope.app.interfaces.services.service import ISimpleService
from zope.app.component.nextservice import queryNextService
from zope.app.services.configuration import NameComponentConfigurable
-from zope.app.traversing import getPath
class ConnectionService(Persistent, NameComponentConfigurable):
=== Zope3/src/zope/app/services/event.py 1.22 => 1.23 ===
--- Zope3/src/zope/app/services/event.py:1.22 Sat Apr 12 07:52:17 2003
+++ Zope3/src/zope/app/services/event.py Thu May 1 15:35:34 2003
@@ -19,14 +19,13 @@
from __future__ import generators
from zope.exceptions import NotFoundError
-from zope.app.interfaces.event import ISubscribingAware, IPublisher, IEvent
-from zope.app.interfaces.event import ISubscriber
+from zope.app.interfaces.event import IEvent, ISubscriber
from zope.app.interfaces.traversing import ITraverser
from zope.app.interfaces.services.event import ISubscriptionService
from zope.app.interfaces.services.event import IEventChannel, IEventService
from zope.app.interfaces.services.service import IBindingAware
-from zope.component import getAdapter, queryAdapter, getService, queryService
+from zope.component import getAdapter, getService, queryService
from zope.component import ComponentLookupError
from zope.app.services.servicenames import HubIds, EventPublication
from zope.app.services.servicenames import EventSubscription
=== Zope3/src/zope/app/services/folder.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/folder.py:1.5 Sun Mar 23 14:24:46 2003
+++ Zope3/src/zope/app/services/folder.py Thu May 1 15:35:34 2003
@@ -23,7 +23,6 @@
from zope.app.interfaces.services.folder import ISiteManagementFolders
from zope.app.interfaces.services.folder import ISiteManagementFolder
from zope.app.interfaces.services.service import IComponentManager
-from zope.app.interfaces.services.service import IServiceManager
from zope.app.services.configuration import ConfigurationManagerContainer
from zope.app.traversing import getPath
from zope.proxy.context import ContextMethod, ContextWrapper
=== Zope3/src/zope/app/services/hub.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/services/hub.py:1.9 Fri Mar 21 10:29:09 2003
+++ Zope3/src/zope/app/services/hub.py Thu May 1 15:35:34 2003
@@ -29,7 +29,7 @@
from zope.component import getAdapter
from zope.exceptions import NotFoundError
-from zope.proxy.context import ContextWrapper, isWrapper, ContextMethod
+from zope.proxy.context import ContextMethod
from zope.proxy.introspection import removeAllProxies
from zope.app.interfaces.traversing import ITraverser
=== Zope3/src/zope/app/services/interface.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/interface.py:1.3 Tue Jan 28 16:03:15 2003
+++ Zope3/src/zope/app/services/interface.py Thu May 1 15:35:34 2003
@@ -13,7 +13,7 @@
##############################################################################
"""Interfaces for persistent modules."""
-from persistence import Persistent, PersistentMetaClass
+from persistence import Persistent
from zodb.code.patch import registerWrapper, Wrapper
from zope.interface.interface import InterfaceClass
=== Zope3/src/zope/app/services/pagefolder.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/services/pagefolder.py:1.4 Mon Apr 28 09:17:01 2003
+++ Zope3/src/zope/app/services/pagefolder.py Thu May 1 15:35:34 2003
@@ -23,14 +23,11 @@
from zope.app.container.btree import BTreeContainer
from zope.app.interfaces.services.view import IZPTTemplate
from zope.publisher.interfaces.browser import IBrowserPresentation
-from zope.app.traversing import getPath, traverse
-from zope.proxy.context import getItem, getAttr
-from zope.proxy.context import ContextMethod
+from zope.app.traversing import getPath
+from zope.proxy.context import getItem, ContextMethod
from zope.app.interfaces.services.configuration import Active
from zope.app.services.configuration import ConfigurationManagerContainer
-from zope.app.services.configuration import ConfigurationStatusProperty
from zope.proxy.introspection import removeAllProxies
-from zope.app.services.folder import SiteManagementFolder
from zope.app.services.view import PageConfiguration
from zope.app.interfaces.services.pagefolder import IPageFolder
from zope.app.interfaces.services.configuration import IConfigurationManager
=== Zope3/src/zope/app/services/service.py 1.17 => 1.18 ===
--- Zope3/src/zope/app/services/service.py:1.17 Mon Apr 28 11:21:08 2003
+++ Zope3/src/zope/app/services/service.py Thu May 1 15:35:34 2003
@@ -31,10 +31,8 @@
from zodb.code.module import PersistentModule
from zodb.code.module import PersistentModuleRegistry
-from zope.component import getAdapter
from zope.component import getServiceManager
from zope.component.exceptions import ComponentLookupError
-from zope.component.interfaces import IServiceService
from zope.proxy.context import ContextMethod
from zope.proxy.context import ContextWrapper
@@ -48,8 +46,6 @@
from zope.app.interfaces.services.module import IModuleService
from zope.app.interfaces.services.service import IServiceConfiguration
from zope.app.interfaces.services.service import IServiceManager
-from zope.app.interfaces.services.service import IServiceManagerContainer
-from zope.app.interfaces.services.configuration import IUseConfiguration
# XXX This makes no sense?
ModuleType = type(IModuleService), PersistentModule
@@ -58,7 +54,6 @@
from zope.app.services.configuration import NameComponentConfigurable
from zope.app.services.configuration import NamedComponentConfiguration
from zope.app.services.folder import SiteManagementFolders
-from zope.app.interfaces.services.configuration import IUseConfigurable
from zope.app.interfaces.services.service import ILocalService
from zope.app.traversing import getPath
=== Zope3/src/zope/app/services/utility.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/utility.py:1.5 Tue Apr 29 12:25:25 2003
+++ Zope3/src/zope/app/services/utility.py Thu May 1 15:35:34 2003
@@ -27,16 +27,10 @@
from zope.app.services.configuration import ConfigurationRegistry
from zope.app.services.configuration import ConfigurationStatusProperty
from zope.app.services.configuration import ComponentConfiguration
-from zope.app.services.configuration import SimpleConfiguration
from zope.component.exceptions import ComponentLookupError
-from zope.component import getAdapter
-from zope.component.interfaces import IUtilityService
from zope.interface.implementor import ImplementorRegistry
from zope.proxy.context import ContextAware
from zope.proxy.context import ContextWrapper
-from zope.proxy.introspection import removeAllProxies
-from zope.app.interfaces.services.configuration import IUseConfiguration
-from zope.app.traversing import getPath
class LocalUtilityService(Persistent, ContextAware):
=== Zope3/src/zope/app/services/zpt.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/services/zpt.py:1.9 Wed Apr 2 14:48:20 2003
+++ Zope3/src/zope/app/services/zpt.py Thu May 1 15:35:34 2003
@@ -17,15 +17,9 @@
import re
-from zope.interface import Interface, Attribute
-import zope.schema
from persistence import Persistent
-from zope.proxy.context import ContextMethod
-from zope.proxy.context import getWrapperContainer
from zope.security.proxy import ProxyFactory
-
-from zope.app.interfaces.content.file import IFileContent
from zope.pagetemplate.pagetemplate import PageTemplate
from zope.app.pagetemplate.engine import AppPT
from zope.app.interfaces.services.view import IZPTTemplate