summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-06-17 19:46:07 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-06-17 19:46:07 -0400
commit247c0471c710b93cff932979c3fb5c33f1785e48 (patch)
tree10f41cf76861086968bddbb8d829a596ccdb5351
parent7f82168cb6b0f0e22d387ffeca1ae82f526c2f29 (diff)
downloadsqlalchemy-247c0471c710b93cff932979c3fb5c33f1785e48.tar.gz
turn this requirement back down as the simpler serialize works better now
-rw-r--r--test/ext/test_serializer.py2
-rw-r--r--test/requirements.py7
2 files changed, 1 insertions, 8 deletions
diff --git a/test/ext/test_serializer.py b/test/ext/test_serializer.py
index f673d5699..84fff1304 100644
--- a/test/ext/test_serializer.py
+++ b/test/ext/test_serializer.py
@@ -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.requires.bulletproof_pickle
+ @testing.requires.non_broken_pickle
def test_query_three(self):
ua = aliased(User)
q = \
diff --git a/test/requirements.py b/test/requirements.py
index aa36dcf85..96c94e84f 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -580,13 +580,6 @@ class DefaultRequirements(SuiteRequirements):
"Needs cPickle or newer Python 3 pickle"
)
- @property
- def bulletproof_pickle(self):
- from sqlalchemy.util import pickle
- return only_if(
- lambda: pickle.__name__ == 'cPickle' and sys.version_info < (3, 0),
- "Needs Python 2.x cPickle"
- )
@property
def predictable_gc(self):