Use getSite from zope.component

CHANGES.txt

@@ -4,6 +4,9 @@ Changelog
 0.9.12 - Unreleased
 -------------------
 
+- Use getSite from zope.component.
+  [hannosch]
+
 0.9.11 - 2010-09-20
 -------------------
 
@@ -12,7 +15,6 @@ Changelog
   Zope2.App.zcml or Products.Five.zcml.
   [davisagli]
 
-
 0.9.10 - 2010-07-13
 -------------------
 

Products/CMFTestCase/five.py

@@ -5,15 +5,7 @@
 # $Id$
 
 from __future__ import nested_scopes
-
-try:
-    from zope.testing.cleanup import cleanUp as _cleanUp
-except ImportError:
-    try:
-        from zope.app.testing.placelesssetup import tearDown as _cleanUp
-    except ImportError:
-        # Zope < 2.8
-        def _cleanUp(): pass
+from zope.testing.cleanup import cleanUp as _cleanUp
 
 
 def cleanUp():

Products/CMFTestCase/setup.py

@@ -307,11 +307,7 @@ def run(self):
 
 def _placefulSetUp(portal):
     '''Sets the local site/manager.'''
-    try:
-        from zope.site.hooks import setHooks, setSite
-    except ImportError:
-        from zope.app.component.hooks import setHooks, setSite
-
+    from zope.component.hooks import setHooks, setSite
     from zope.component.interfaces import ComponentLookupError
     setHooks()
     try:
@@ -322,10 +318,7 @@ def _placefulSetUp(portal):
 
 def _placefulTearDown():
     '''Resets the local site/manager.'''
-    try:
-        from zope.site.hooks import resetHooks, setSite
-    except ImportError:
-        from zope.app.component.hooks import resetHooks, setSite
+    from zope.component.hooks import resetHooks, setSite
 
     resetHooks()
     setSite()

Products/CMFTestCase/testCMFTestCase.py

@@ -58,7 +58,7 @@ def testSkinScript(self):
     if CMFTestCase.CMF21:
 
         def testGetSite(self):
-            from zope.app.component.hooks import getSite
+            from zope.component.hooks import getSite
             self.failUnless(aq_base(getSite()) is aq_base(self.portal))