Merge pull request #12 from zopefoundation/add-py35-support

Add support for Python 3.5

.travis.yml

@@ -1,18 +1,15 @@
 language: python
 sudo: false
-
-env:
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
-  - TOXENV=pypy
-  - TOXENV=pypy3
-
+python:
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
+  - pypy
+  - pypy3
 install:
-  - travis_retry pip install tox
-
+  - pip install tox-travis
 script:
   - tox
-
 notifications:
     email: false

CHANGES.rst

@@ -4,6 +4,8 @@ Changes
 4.3.0 (unreleased)
 ------------------
 
+- Add support for Python 3.5.
+
 - Drop support for Python 2.6 and 3.2.
 
 

setup.py

@@ -63,6 +63,7 @@ def read(*rnames):
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Natural Language :: English',

src/zope/publisher/tests/test_http.py

@@ -487,8 +487,10 @@ def testCookieErrorToLog(self):
             handler.uninstall()
 
         self.assertEqual(len(handler.records), 1)
-        self.assertEqual(handler.records[0].getMessage(),
-                         'Illegal key value: ldap/OU')
+
+        message = handler.records[0].getMessage()
+        self.assertTrue(message.startswith('Illegal key'))
+        self.assertTrue('ldap/OU' in message)
 
         self.assertFalse(req.cookies.has_key('foo'))
         self.assertFalse(req.has_key('foo'))

tox.ini

@@ -4,7 +4,7 @@ envlist =
 
 [testenv]
 commands =
-    python setup.py test -q
+    python setup.py -q test -q
 # without explicit deps, setup.py test will download a bunch of eggs into $PWD
 deps =
     six