merge 2.7.4 release branch

2013-03-30 15:31:31 -04:00 · 2013-03-30 15:31:31 -04:00 · 472f77daa5
parent 337b1737df f3ad030a74
commit 472f77daa5
1 changed files with 1 additions and 1 deletions
--- 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