Drop ZServer dependency by using the WSGI server.

zopefoundation · May 23, 2018 · 7bdbc4c · 7bdbc4c
1 parent c1ff558
commit 7bdbc4c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,6 +6,9 @@ Changelog
 
 - Drop support for Zope 2, require Zope 4 now.
 
+- Drop `ZServer` dependency.
+
+
 4.0 (2016-07-22)
 ----------------
 

diff --git a/setup.py b/setup.py
@@ -15,8 +15,6 @@
 
 from setuptools import setup, find_packages
 
-import sys
-
 INSTALL_REQUIRES = [
     'setuptools',
     'AccessControl',
@@ -29,12 +27,6 @@
     'zope.event',
 ]
 
-PY2_ONLY = [
-    'ZServer',
-]
-
-if sys.version_info[0] == 2:
-    INSTALL_REQUIRES += PY2_ONLY
 
 setup(
     name='Products.SiteErrorLog',

diff --git a/src/Products/SiteErrorLog/tests/testSiteErrorLog.py b/src/Products/SiteErrorLog/tests/testSiteErrorLog.py
@@ -23,12 +23,11 @@
 
 from Products.SiteErrorLog.interfaces import IErrorRaisedEvent
 
-Zope2.startup()
-
 
 class SiteErrorLogTests(unittest.TestCase):
 
     def setUp(self):
+        Zope2.startup_wsgi()
         transaction.begin()
         self.app = makerequest(Zope2.app())
         try: