Add PyPy support.

.travis.yml

@@ -2,6 +2,7 @@ language: python
 sudo: false
 python:
     - 2.7
+    - pypy
     - 3.4
     - 3.5
     - 3.6

CHANGES.txt

@@ -2,26 +2,27 @@
 CHANGES
 =======
 
-3.10.0 (unreleased)
+4.0.0 (unreleased)
 -------------------
 
 - Drop Python 2.6 support.
 
 - Add Python 3.4, 3.5, and 3.6 support.
 
+- Add PyPy support.
 
 3.9.0 (2013-03-13)
 ------------------
 
 - Better adherence to WSGI:
 
-  * Call close method if present on iterables returned by 
+  * Call close method if present on iterables returned by
     ``start_response``.
 
   * Don't include non-string values in the CGI environment
     (``CHANNEL_CREATION_TIME``).
 
-  * Always include ``QUERY_STRING`` to avoid the cgi module falling back 
+  * Always include ``QUERY_STRING`` to avoid the cgi module falling back
     to ``sys.argv``.
 
   * Add tests based on `paste.lint` middleware.

setup.py

@@ -38,7 +38,7 @@ def read(*rnames):
 
 setup(
     name='zope.server',
-    version='3.9.1.dev0',
+    version='4.0.0.dev0',
     author='Zope Foundation and Contributors',
     author_email='zope-dev@zope.org',
     description='Zope Server (Web and FTP)',
@@ -62,6 +62,7 @@ def read(*rnames):
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',

src/zope/server/http/tests/test_httpserver.py

@@ -14,6 +14,7 @@
 """Test HTTP Server
 """
 import unittest
+import gc
 from asyncore import socket_map, poll
 from time import sleep, time
 import socket
@@ -108,6 +109,9 @@ def tearDown(self):
             if time() >= timeout: # pragma: no cover
                 self.fail('Leaked a socket: %s' % repr(socket_map))
             poll(0.1) # pragma: no cover
+            # bandage for PyPy: sometimes we were relying on GC to close sockets.
+            # (This sometimes comes up under coverage on Python 2 as well)
+            gc.collect()
         super(Tests, self).tearDown()
 
     def loop(self):

tox.ini

@@ -1,6 +1,7 @@
 [tox]
 envlist =
     py27,
+    pypy,
     py34,
     py35,
     py36,