diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-03-30 14:37:25 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-03-30 14:37:25 (GMT) |
| commit | 337b1737df66a466d12effcee515653e0b6ad024 (patch) | |
| tree | 0a43b7853e628092919c2f14fd2a594fbfa62ac8 /Lib/test/pickletester.py | |
| parent | da76aa8e47ea6be5d77900b6a04adb7c756467f2 (diff) | |
| parent | d627e122d79802c3f91d6157af6af34d6f6a1757 (diff) | |
| download | cpython-337b1737df66a466d12effcee515653e0b6ad024.zip cpython-337b1737df66a466d12effcee515653e0b6ad024.tar.gz cpython-337b1737df66a466d12effcee515653e0b6ad024.tar.bz2 | |
merge 2.7.4 release branch
Diffstat (limited to 'Lib/test/pickletester.py')
| -rw-r--r-- | Lib/test/pickletester.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index 3e7e11d..c95531f 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -6,8 +6,14 @@ import cStringIO import pickletools import copy_reg -from test.test_support import (TestFailed, have_unicode, TESTFN, _2G, _1M, - precisionbigmemtest) +from test.test_support import TestFailed, verbose, have_unicode, TESTFN +try: + from test.test_support import _2G, _1M, precisionbigmemtest +except ImportError: + # this import might fail when run on older Python versions by test_xpickle + _2G = _1G = 0 + def precisionbigmemtest(*args, **kwargs): + return lambda self: None # Tests that try a number of pickle protocols should have a # for proto in protocols: |