Merge branch 'python34' of git://github.com/NextThought/zodbpickle in…

…to NextThought-python34

Conflicts:
	.travis.yml
	src/zodbpickle/tests/pickletester_2.py

.travis.yml

@@ -5,6 +5,7 @@ python:
     - 2.7
     - 3.2
     - 3.3
+    - 3.4
     - pypy
     - pypy3
 install:

setup.py

@@ -61,6 +61,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Framework :: ZODB',

src/zodbpickle/tests/pickletester_3.py

@@ -30,6 +30,8 @@ def wrapper(*args, **kwargs):
         return wrapper
 
 _PY33 = sys.version_info[:2] >= (3, 3)
+_PY34 = sys.version_info[:2] >= (3, 4)
+_PY343 = sys.version_info[:3] >= (3, 4, 3)
 
 from zodbpickle.pickle_3 import bytes_types
 from . import _is_pure
@@ -1109,8 +1111,8 @@ def test_bad_getattr(self):
         for proto in 0, 1:
             self.assertRaises(RuntimeError, self.dumps, x, proto)
 
-        # protocol 2 don't raise a RuntimeError, except under PyPy
-        if _is_pypy or _is_pure:
+        # protocol 2 don't raise a RuntimeError, except under PyPy, or Python >= 3.4
+        if _is_pypy or (_is_pure and not _PY33) or _PY34:
             self.assertRaises(RuntimeError, self.dumps, x, 2)
         else:
             self.dumps(x, 2)
@@ -1180,7 +1182,14 @@ def test_unpickle_from_2x(self):
         loaded = self.loads(DATA5)
         self.assertEqual(type(loaded), SimpleCookie)
         self.assertEqual(list(loaded.keys()), ["key"])
-        self.assertEqual(loaded["key"].value, "Set-Cookie: key=value")
+        if _PY343:
+            # The SimpleCookie object changed the way it gets
+            # constructed in Python 3.4.3; the old behaviour was
+            # broken.
+            # See http://bugs.python.org/issue22775
+            self.assertEqual(loaded["key"].value, "value")
+        else:
+            self.assertEqual(loaded["key"].value, "Set-Cookie: key=value")
 
     def test_pickle_to_2x(self):
         # Pickle non-trivial data with protocol 2, expecting that it yields

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py32,py33,pypy,pypy3
+envlist = py26,py27,py32,py33,py34,pypy,pypy3
 
 [testenv]
 deps =