[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/app/component/ get rid of BBB left-overs that are goners in 3.3

[Philipp von Weitershausen]

Log message for revision 67580:
  get rid of BBB left-overs that are goners in 3.3
  

Changed:
  U   Zope3/branches/jim-adapter/src/zope/app/component/__init__.py
  D   Zope3/branches/jim-adapter/src/zope/app/component/bbb/

-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/component/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/__init__.py	2006-04-25 05:43:19 UTC (rev 67579)
+++ Zope3/branches/jim-adapter/src/zope/app/component/__init__.py	2006-04-25 08:23:38 UTC (rev 67580)
@@ -18,13 +18,7 @@
 __docformat__ = "reStructuredText"
 import zope.component
 import zope.app.component.interfaces
-from zope.app import zapi
 
-# BBB: Will go away in 3.3.
-from zope.app.component.bbb import localservice
-import sys
-sys.modules['zope.app.component.localservice'] = localservice
-
 _marker = object()
 
 def getNextSiteManager(context):
@@ -42,13 +36,13 @@
     If the site manager of the given context is the global site manager, then
     `default` is returned.
     """
-    sm = zapi.getSiteManager(context)
+    sm = zope.component.getSiteManager(context)
     if not zope.app.component.interfaces.ILocalSiteManager.providedBy(sm):
         return default
 
     bases = sm.__bases__
     if not bases:
-        return zapi.getGlobalSiteManager()
+        return zope.component.getGlobalSiteManager()
     return bases[0]