fix serializer tests. something is wrong with non-C pickle but for some reason py3k's pickle seems to be OK? not sure why that is, as this

is all related to http://bugs.python.org/issue998998

5 files changed, 32 insertions, 26 deletions

diff --git a/lib/sqlalchemy/ext/serializer.py b/lib/sqlalchemy/ext/serializer.py
index 759652014..8abd1fdf3 100644
--- a/lib/sqlalchemy/ext/serializer.py
+++ b/lib/sqlalchemy/ext/serializer.py
@@ -58,26 +58,9 @@ from ..orm.interfaces import MapperProperty
 from ..orm.attributes import QueryableAttribute
 from .. import Table, Column
 from ..engine import Engine
-from ..util import pickle
+from ..util import pickle, byte_buffer, b64encode, b64decode
 import re
-import base64
-# start Py3K
-from io import BytesIO as byte_buffer
-# end Py3K
-# start Py2K
-#from cStringIO import StringIO as byte_buffer
-# end Py2K
-
-# start Py3K
-def b64encode(x):
-    return base64.b64encode(x).decode('ascii')
-def b64decode(x):
-    return base64.b64decode(x.encode('ascii'))
-# end Py3K
-# start Py2K
-#b64encode = base64.b64encode
-#b64decode = base64.b64decode
-# end Py2K
+
 
 __all__ = ['Serializer', 'Deserializer', 'dumps', 'loads']
 
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index b1f1a2db6..d1fc8e8e5 100644
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -9,7 +9,7 @@ from .compat import callable, cmp, reduce,  \
     pickle, dottedgetter, parse_qsl, namedtuple, next, WeakSet, reraise, \
     raise_from_cause, text_type, string_types, int_types, binary_type, \
     quote_plus, with_metaclass, print_, itertools_filterfalse, u, ue, b,\
-    unquote_plus
+    unquote_plus, b64decode, b64encode, byte_buffer
 
 from ._collections import KeyedTuple, ImmutableContainer, immutabledict, \
     Properties, OrderedProperties, ImmutableProperties, OrderedDict, \
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index e8404c2df..ea97999cf 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -28,7 +28,7 @@ if py3k:
     import pickle
 else:
     try:
-        import pickle as pickle
+        import cPickle as pickle
     except ImportError:
         import pickle
 
@@ -40,6 +40,9 @@ if py3k:
     import configparser
     from io import StringIO
 
+    from io import BytesIO as byte_buffer
+
+
     string_types = str,
     binary_type = bytes
     text_type = str
@@ -73,12 +76,20 @@ if py3k:
     import itertools
     itertools_filterfalse = itertools.filterfalse
     itertools_imap = map
+
+    import base64
+    def b64encode(x):
+        return base64.b64encode(x).decode('ascii')
+    def b64decode(x):
+        return base64.b64decode(x.encode('ascii'))
+
 else:
     from inspect import getargspec as inspect_getfullargspec
     from urllib import quote_plus, unquote_plus
     from urlparse import parse_qsl
     import ConfigParser as configparser
     from StringIO import StringIO
+    from cStringIO import StringIO as byte_buffer
 
     string_types = basestring,
     binary_type = str
@@ -109,6 +120,10 @@ else:
     cmp = cmp
     reduce = reduce
 
+    import base64
+    b64encode = base64.b64encode
+    b64decode = base64.b64decode
+
     def print_(*args, **kwargs):
         fp = kwargs.pop("file", sys.stdout)
         if fp is None:
diff --git a/test/ext/test_serializer.py b/test/ext/test_serializer.py
index 0c7298a8b..84fff1304 100644
--- a/test/ext/test_serializer.py
+++ b/test/ext/test_serializer.py
@@ -114,7 +114,7 @@ class SerializeTest(fixtures.MappedTest):
             Address(email='ed@lala.com'),
             Address(email='ed@bettyboop.com')])
 
-    @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported")
+    @testing.requires.non_broken_pickle
     def test_query_two(self):
         q = \
             Session.query(User).join(User.addresses).\
@@ -124,7 +124,7 @@ class SerializeTest(fixtures.MappedTest):
         eq_(q2.all(), [User(name='fred')])
         eq_(list(q2.values(User.id, User.name)), [(9, 'fred')])
 
-    @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported")
+    @testing.requires.non_broken_pickle
     def test_query_three(self):
         ua = aliased(User)
         q = \
@@ -138,7 +138,7 @@ class SerializeTest(fixtures.MappedTest):
         ua_2 = q2._entities[0].entity_zero.entity
         eq_(list(q2.values(ua_2.id, ua_2.name)), [(9, 'fred')])
 
-    @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported")
+    @testing.requires.non_broken_pickle
     def test_orm_join(self):
         from sqlalchemy.orm.util import join
 
@@ -165,8 +165,7 @@ class SerializeTest(fixtures.MappedTest):
         eq_(list(q2.all()), [(u7, u8), (u7, u9), (u7, u10), (u8, u9),
             (u8, u10)])
 
-    @testing.skip_if(lambda: util.pypy, "pickle sometimes has "
-                        "problems here, sometimes not")
+    @testing.requires.non_broken_pickle
     def test_any(self):
         r = User.addresses.any(Address.email == 'x')
         ser = serializer.dumps(r, -1)
diff --git a/test/requirements.py b/test/requirements.py
index c20bcbd0a..c09c0df99 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -556,6 +556,15 @@ class DefaultRequirements(SuiteRequirements):
                "cPython interpreter needed"
              )
 
+
+    @property
+    def non_broken_pickle(self):
+        from sqlalchemy.util import pickle
+        return only_if(
+            lambda: pickle.__name__ == 'cPickle' or sys.version_info >= (3, 2),
+            "Needs cPickle or newer Python 3 pickle"
+        )
+
     @property
     def predictable_gc(self):
         """target platform must remove all cycles unconditionally when