[Zope3-checkins] CVS: Zope3/src/zope/app/site - servicecontainer.py:1.3 service.py:1.6

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app/site
In directory cvs.zope.org:/tmp/cvs-serv6813/site

Modified Files:
	servicecontainer.py service.py 
Log Message:
cleanup


=== Zope3/src/zope/app/site/servicecontainer.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/site/servicecontainer.py:1.2	Sat Mar 13 23:03:31 2004
+++ Zope3/src/zope/app/site/servicecontainer.py	Wed May  5 04:42:06 2004
@@ -27,13 +27,11 @@
 from zope.interface import implements
 
 class ServiceManagerContainer(Contained):
-
     """Implement access to the service manager (++etc++site).
 
     This is a mix-in that implements the IPossibleSite
     interface; for example, it is used by the Folder implementation.
     """
-
     zope.interface.implements(IPossibleSite)
 
     __sm = None
@@ -56,6 +54,5 @@
             raise ValueError('setSiteManager requires an IServiceService')
 
         zope.interface.directlyProvides(
-            self,
-            ISite,
+            self, ISite,
             zope.interface.directlyProvidedBy(self))


=== Zope3/src/zope/app/site/service.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/site/service.py:1.5	Sat Apr 17 11:13:13 2004
+++ Zope3/src/zope/app/site/service.py	Wed May  5 04:42:06 2004
@@ -25,8 +25,18 @@
 
 $Id$
 """
+import sys
 from transaction import get_transaction
 from zodbcode.module import PersistentModuleRegistry
+
+import zope.interface
+from zope.component.exceptions import ComponentLookupError
+from zope.component import getServiceManager
+from zope.fssync.server.entryadapter import AttrMapping, DirectoryAdapter
+from zope.proxy import removeAllProxies
+
+import zope.app.registration.interfaces
+from zope.app import zapi
 from zope.app.component.nextservice import getNextService
 from zope.app.component.nextservice import getNextServiceManager
 from zope.app.container.btree import BTreeContainer
@@ -34,24 +44,17 @@
 from zope.app.container.contained import Contained
 from zope.app.container.interfaces import IContainer
 from zope.app.event.function import Subscriber
-from zope.app import zapi
-from interfaces import IBindingAware, ILocalService, IServiceRegistration
-from interfaces import IPossibleSite, ISite, ISiteManager
 from zope.app.registration.interfaces import IRegistry
 from zope.app.traversing.interfaces import IContainmentRoot
+from zope.app.traversing import getPath
 from zope.app.location import inside
 from zope.app.site.folder import SiteManagementFolder
-from zope.app.registration.registration import \
-     ComponentRegistration, RegistrationStack
-from zope.app.traversing import getPath
-from zope.component.exceptions import ComponentLookupError
-from zope.component import getServiceManager
-from zope.fssync.server.entryadapter import AttrMapping, DirectoryAdapter
-from zope.proxy import removeAllProxies
-import sys
-import zope.app.registration.interfaces
-import zope.interface
+from zope.app.registration.registration import ComponentRegistration
+from zope.app.registration.registration import RegistrationStack
 
+from zope.app.site.interfaces import IBindingAware, ILocalService
+from zope.app.site.interfaces import IPossibleSite, ISite, ISiteManager
+from zope.app.site.interfaces import IServiceRegistration
 
 class IRegisterableContainerContainer(zope.interface.Interface):