summaryrefslogtreecommitdiff
path: root/test/requirements.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-08-01 20:25:56 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-08-01 20:25:56 -0400
commitd2a6238372bf8050b847f5755817b5a1a16fcf10 (patch)
tree2c553153d16052824e7de21c513ce68f56d7679f /test/requirements.py
parent25839c064d995b3664f0cef01768961ac5e4807f (diff)
downloadsqlalchemy-d2a6238372bf8050b847f5755817b5a1a16fcf10.tar.gz
- assorted fixes raised by pypy 2.1beta2, but all of which are good
ideas in general: - pypy2.1 w/ sqlite3 is the first DBAPI we're seeing returning unicode in cursor.description without being py3k. add a new on-connect check for this, if we get back a u"", just don't do description decoding, should be OK for now. - the set tests in test_collection were assuming the two sets would be ordered the same when it tested pop(), can't really assume that. - test_serializer gets worse and worse, pickle is just not really viable here, ding out pypy - pypy2.1b2 seems to allow cursor.lastrowid to work (or we changed something?) - pool._threadconns.current() is a weakref, it can be None - another one of those logging.handlers imports
Diffstat (limited to 'test/requirements.py')
-rw-r--r--test/requirements.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/requirements.py b/test/requirements.py
index a56c037d1..2bd395404 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -579,8 +579,9 @@ class DefaultRequirements(SuiteRequirements):
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"
+ lambda: not util.pypy and pickle.__name__ == 'cPickle'
+ or sys.version_info >= (3, 2),
+ "Needs cPickle+cPython or newer Python 3 pickle"
)