[Zope-Checkins] SVN: Zope/trunk/lib/python/Testing/ZopeTestCase/ Resolve left-over 'Zope' vs 'Zope2' issues.

[Stefan H. Holek]

Log message for revision 29433:
  Resolve left-over 'Zope' vs 'Zope2' issues.
  

Changed:
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/functional.py
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/sandbox.py

-=-
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py	2005-03-10 15:58:44 UTC (rev 29432)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py	2005-03-10 18:53:23 UTC (rev 29433)
@@ -20,7 +20,7 @@
 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.'''

Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/functional.py
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/functional.py	2005-03-10 15:58:44 UTC (rev 29432)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/functional.py	2005-03-10 18:53:23 UTC (rev 29433)
@@ -53,7 +53,7 @@
         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)
 

Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/sandbox.py
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/sandbox.py	2005-03-10 15:58:44 UTC (rev 29432)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/sandbox.py	2005-03-10 18:53:23 UTC (rev 29433)
@@ -19,7 +19,7 @@
 
     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)