diff options
Diffstat (limited to 'lib/sqlalchemy/testing/util.py')
-rw-r--r-- | lib/sqlalchemy/testing/util.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/sqlalchemy/testing/util.py b/lib/sqlalchemy/testing/util.py index 5facd2f06..1288902f2 100644 --- a/lib/sqlalchemy/testing/util.py +++ b/lib/sqlalchemy/testing/util.py @@ -1,4 +1,4 @@ -from ..util import jython, pypy, defaultdict, decorator +from ..util import jython, pypy, defaultdict, decorator, py2k import decimal import gc import time @@ -32,13 +32,13 @@ else: def picklers(): picklers = set() -# start Py2K -# try: -# import cPickle -# picklers.add(cPickle) -# except ImportError: -# pass -# end Py2K + if py2k: + try: + import cPickle + picklers.add(cPickle) + except ImportError: + pass + import pickle picklers.add(pickle) |