Copy startup and zope.conf parsing logic to ZServer.

src/App/config.py

@@ -14,6 +14,7 @@
 
 _config = None
 
+
 def getConfiguration():
     """Return the global Zope configuration object.
 
@@ -25,6 +26,7 @@ def getConfiguration():
         setConfiguration(DefaultConfiguration())
     return _config
 
+
 def setConfiguration(cfg):
     """Set the global configuration object.
 
@@ -54,6 +56,7 @@ def setConfiguration(cfg):
 
     Globals.DevelopmentMode = cfg.debug_mode
 
+
 class DefaultConfiguration:
     """
     This configuration should be used effectively only during unit tests
@@ -64,12 +67,8 @@ def __init__(self):
         self.instancehome = FindHomes.INSTANCE_HOME
         self.dbtab = None
         self.debug_mode = True
-        self.enable_product_installation = False
         self.locale = None
 
-        # ZServer.HTTPServer
-        self.http_header_max_length = 8196
-
         # VerboseSecurity
         self.skip_ownership_checking = False
         self.skip_authentication_checking = False

src/OFS/tests/testAcquisition.py

@@ -21,9 +21,6 @@
 
 from Testing.makerequest import makerequest
 
-import Zope2
-Zope2.startup()
-
 from OFS.SimpleItem import SimpleItem
 from AccessControl import ClassSecurityInfo
 from AccessControl.class_init import InitializeClass
@@ -33,6 +30,9 @@
 from AccessControl.ImplPython import guarded_getattr as guarded_getattr_py
 from AccessControl.ImplC import guarded_getattr as guarded_getattr_c
 
+import Zope2
+Zope2.startup_wsgi()
+
 
 class AllowedItem(SimpleItem):
     id = 'allowed'

src/OFS/tests/testCopySupportEvents.py

@@ -15,7 +15,7 @@
 from Testing.makerequest import makerequest
 from Zope2.App import zcml
 
-Zope2.startup()
+Zope2.startup_wsgi()
 
 
 class EventLogger(object):

src/OFS/tests/testCopySupportHooks.py

@@ -16,7 +16,7 @@
 
 from Zope2.App import zcml
 
-Zope2.startup()
+Zope2.startup_wsgi()
 
 
 class EventLogger(object):

src/OFS/tests/testFileAndImage.py

@@ -35,7 +35,7 @@
 imagedata = os.path.join(here, 'test.gif')
 filedata = os.path.join(here, 'test.gif')
 
-Zope2.startup()
+Zope2.startup_wsgi()
 
 
 def makeConnection():

src/OFS/tests/testHistory.py

@@ -1,18 +1,18 @@
-import unittest
-import Zope2
-Zope2.startup()
-
 import os
 import shutil
 import time
-import transaction
 import tempfile
+import unittest
+
+import transaction
 import ZODB
+from ZODB.FileStorage import FileStorage
 
 from OFS.Application import Application
 from OFS.History import Historical
 from OFS.SimpleItem import SimpleItem
-from ZODB.FileStorage import FileStorage
+import Zope2
+Zope2.startup_wsgi()
 
 
 class HistoryItem(SimpleItem, Historical):

src/Testing/ZopeTestCase/ZopeLite.py

@@ -88,6 +88,7 @@ def _configure_client_cache():
 
 _exec('import Zope2')
 import Zope2
+import Zope2.Startup.run
 _exec('import ZODB')
 import ZODB
 _write('.')
@@ -214,7 +215,7 @@ def _installPackage(name, quiet=0):
 app = Zope2.app
 debug = Zope2.debug
 DB = Zope2.DB
-configure = Zope2.configure
+configure = Zope2.Startup.run.configure_wsgi
 def startup(): pass
 Zope = Zope2
 active = _patched

src/ZPublisher/tests/testPostTraversal.py

@@ -5,7 +5,7 @@
 from ZPublisher.HTTPResponse import HTTPResponse
 import Zope2
 
-Zope2.startup()
+Zope2.startup_wsgi()
 
 pt_simple_was_run = 0
 

src/Zope2/Startup/__init__.py

@@ -14,27 +14,18 @@
 
 from __future__ import absolute_import
 
-import sys
-
 from zope.deferredimport import deprecated
 
 # BBB Zope 5.0
 deprecated(
     'Please import from ZServer.Zope2.Startup.starter',
+    get_starter='ZServer.Zope2.Startup.starter:get_starter',
     UnixZopeStarter='ZServer.Zope2.Startup.starter:UnixZopeStarter',
     WindowsZopeStarter='ZServer.Zope2.Startup.starter:WindowsZopeStarter',
     ZopeStarter='ZServer.Zope2.Startup.starter:ZopeStarter',
 )
 
 
-def get_starter(wsgi=False):
-    if wsgi:
-        from Zope2.Startup.starter import WSGIStarter
-        return WSGIStarter()
-    else:
-        if sys.platform[:3].lower() == "win":
-            from ZServer.Zope2.Startup.starter import WindowsZopeStarter
-            return WindowsZopeStarter()
-        else:
-            from ZServer.Zope2.Startup.starter import UnixZopeStarter
-            return UnixZopeStarter()
+def get_wsgi_starter():
+    from Zope2.Startup.starter import WSGIStarter
+    return WSGIStarter()