diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-07 17:51:12 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-07 17:51:12 -0400 |
| commit | 0d9ec9fe840eb71935c2a55c3063620a028e59aa (patch) | |
| tree | b1243b5b7bba44066d3f5bb451f0d3ab2c97cd57 /lib/sqlalchemy/testing/util.py | |
| parent | 1188edccf6b796fdc2d8bd24985a71fb6060eae7 (diff) | |
| download | sqlalchemy-0d9ec9fe840eb71935c2a55c3063620a028e59aa.tar.gz | |
remove all remaining start/end py2k/py3k blocks
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) |