Change to get version_txt from a module function rather than from

a persistent object.  Importing Main breaks Zope 2 (which doesn't use Main).
Note that something needs to import Main or Zope before this gets called.

ZServer/HTTPServer.py

@@ -124,9 +124,8 @@ CONNECTION = regex.compile ('Connection: \(.*\)', regex.casefold)
 
 ZSERVER_VERSION='1.1b1'
 try:
-    import Main
-    ZOPE_VERSION=Main.app.Control_Panel.version_txt()
-    del Main
+    import App.ApplicationManager
+    ZOPE_VERSION=App.ApplicationManager.version_txt()
 except:
     ZOPE_VERSION='experimental'
     

lib/python/ZServer/HTTPServer.py

@@ -124,9 +124,8 @@ CONNECTION = regex.compile ('Connection: \(.*\)', regex.casefold)
 
 ZSERVER_VERSION='1.1b1'
 try:
-    import Main
-    ZOPE_VERSION=Main.app.Control_Panel.version_txt()
-    del Main
+    import App.ApplicationManager
+    ZOPE_VERSION=App.ApplicationManager.version_txt()
 except:
     ZOPE_VERSION='experimental'