[Zope-Checkins] SVN: Zope/branches/jim-move-Zope/lib/python/ Changed some more references to Zope to Zope2

[Jim Fulton]

Log message for revision 28990:
  Changed some more references to Zope to Zope2
  

Changed:
  U   Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/threadutils.py
  U   Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/handlers.py
  U   Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/tests/testStarter.py

-=-
Modified: Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/threadutils.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/threadutils.py	2005-01-31 12:15:19 UTC (rev 28989)
+++ Zope/branches/jim-move-Zope/lib/python/Testing/ZopeTestCase/threadutils.py	2005-01-31 12:46:40 UTC (rev 28990)
@@ -18,7 +18,7 @@
     if log is None: log = dummyLOG
     lg = logger.file_logger(log)
     hs = zhttp_server(ip=host, port=port, resolver=None, logger_object=lg)
-    zh = zhttp_handler(module='Zope', uri_base='')
+    zh = zhttp_handler(module='Zope2', uri_base='')
     hs.install_handler(zh)
     asyncore.loop()
 

Modified: Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/handlers.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/handlers.py	2005-01-31 12:15:19 UTC (rev 28989)
+++ Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/handlers.py	2005-01-31 12:46:40 UTC (rev 28990)
@@ -150,7 +150,7 @@
     for factory in config.servers:
         factory.prepare(config.ip_address or '',
                         config.dns_resolver,
-                        "Zope",
+                        "Zope2",
                         config.cgi_environment,
                         config.port_base)
 

Modified: Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/tests/testStarter.py
===================================================================
--- Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/tests/testStarter.py	2005-01-31 12:15:19 UTC (rev 28989)
+++ Zope/branches/jim-move-Zope/lib/python/Zope2/Startup/tests/testStarter.py	2005-01-31 12:46:40 UTC (rev 28990)
@@ -183,7 +183,7 @@
         starter = self.get_starter(conf)
         # do the job the 'handler' would have done (call prepare)
         for server in conf.servers:
-            server.prepare('', None, 'Zope', {}, None)
+            server.prepare('', None, 'Zope2', {}, None)
         try:
             starter.setupServers()
             import ZServer
@@ -213,7 +213,7 @@
         ## starter = self.get_starter(conf)
         ## # do the job the 'handler' would have done (call prepare)
         ## for server in conf.servers:
-        ##     server.prepare('', None, 'Zope', {}, None)
+        ##     server.prepare('', None, 'Zope2', {}, None)
         ## try:
         ##     self.assertRaises(ZConfig.ConfigurationError, starter.setupServers)
         ## finally: