Resolve left-over 'Zope' vs 'Zope2' issues.

lib/python/Testing/ZopeTestCase/ZopeLite.py

@@ -20,7 +20,7 @@ import os, sys, time
 sys.setcheckinterval(2500)
 
 # Shut up if we are not in control of the import process
-_quiet = sys.modules.has_key('Zope')
+_quiet = sys.modules.has_key('Zope2')
 
 def _print(msg):
     '''Writes 'msg' to stderr and flushes the stream.'''

lib/python/Testing/ZopeTestCase/functional.py

@@ -53,7 +53,7 @@ class Functional(sandbox.Sandboxed):
         outstream = StringIO()
         response = Response(stdout=outstream, stderr=sys.stderr) 
 
-        publish_module('Zope', response=response, environ=env, extra=extra)
+        publish_module('Zope2', response=response, environ=env, extra=extra)
 
         return ResponseWrapper(response, outstream, path)
 

lib/python/Testing/ZopeTestCase/sandbox.py

@@ -19,7 +19,7 @@ class Sandboxed:
 
     def _app(self):
         '''Returns the app object for a test.'''
-        app = Zope2.app(Zope.sandbox().open())
+        app = Zope2.app(Zope2.sandbox().open())
         AppZapper().set(app)
         return utils.makerequest(app)