Merge branch 'master' into control-fixes

.travis.yml

@@ -5,10 +5,17 @@ python:
     - 3.3
     - 3.4
     - 3.5
+    - 3.6
+    - pypy-5.4.1
+    - pypy3.3-5.2-alpha1
+matrix:
+    include:
+        - python: "2.7"
+          env: TOXENV=flake8,docs
 install:
-    - pip install tox
+    - pip install tox tox-travis
 script:
-    - tox -e py${TRAVIS_PYTHON_VERSION//[.]/}
+    - tox
 # Alternative: use buildout instead of tox
 #install:
 #    - python bootstrap.py

CHANGES.rst

@@ -21,6 +21,8 @@ CHANGES
 
 - Fix setting empty values on a select control.
 
+- Support Python 3.6, PyPy2.7 an PyPy3.3.
+
 
 5.1 (2017-01-31)
 ----------------

setup.py

@@ -42,6 +42,9 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Testing',
         'Topic :: Internet :: WWW/HTTP',
     ],

src/zope/testbrowser/tests/test_wsgi.py

@@ -94,8 +94,8 @@ def test_redirect(self):
         self.assertEqual(browser.headers.get('status'), '200 OK')
         form = browser.getForm(name='redirect')
         form.submit()
-        self.assertEquals(browser.headers.get('status'), '200 OK')
-        self.assertEquals(browser.url, 'http://localhost/set_status.html')
+        self.assertEqual(browser.headers.get('status'), '200 OK')
+        self.assertEqual(browser.url, 'http://localhost/set_status.html')
 
     def test_non_redirecting_30x_status(self):
         app = WSGITestApplication()

tox.ini

@@ -1,6 +1,14 @@
 [tox]
 envlist =
-    py27,py33,py34,py35,docs,flake8
+    py27,
+    py33,
+    py34,
+    py35,
+    py36,
+    pypy,
+    pypy3,
+    docs,
+    flake8
 
 [testenv]
 deps =