Changed some more references to Zope to Zope2

lib/python/Testing/ZopeTestCase/threadutils.py

@@ -18,7 +18,7 @@ def zserverRunner(host, port, log=None):
     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()
 

lib/python/Zope2/Startup/handlers.py

@@ -150,7 +150,7 @@ def root_handler(config):
     for factory in config.servers:
         factory.prepare(config.ip_address or '',
                         config.dns_resolver,
-                        "Zope",
+                        "Zope2",
                         config.cgi_environment,
                         config.port_base)
 

lib/python/Zope2/Startup/tests/testStarter.py

@@ -183,7 +183,7 @@ class ZopeStarterTestCase(test_logger.LoggingTestBase):
         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 @@ class ZopeStarterTestCase(test_logger.LoggingTestBase):
         ## 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: