summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-03-30 19:31:31 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-03-30 19:31:31 (GMT)
commit472f77daa5b7bca7625ca5f4b8e9aaed6e3acef0 (patch)
tree97a6a104d54ebd16267c601964e37445b64a916a /Lib
parent337b1737df66a466d12effcee515653e0b6ad024 (diff)
parentf3ad030a742b6dcbc34286f57326758ca3d42829 (diff)
downloadcpython-472f77daa5b7bca7625ca5f4b8e9aaed6e3acef0.zip
cpython-472f77daa5b7bca7625ca5f4b8e9aaed6e3acef0.tar.gz
cpython-472f77daa5b7bca7625ca5f4b8e9aaed6e3acef0.tar.bz2
merge 2.7.4 release branch
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/pickletester.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index c95531f..7f43dfb 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -11,7 +11,7 @@ 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
+ _2G = _1M = 0
def precisionbigmemtest(*args, **kwargs):
return lambda self: None