[Python-checkins] cpython (merge 2.7 -> 2.7): merge 2.7.4 release branch

[benjamin.peterson]

http://hg.python.org/cpython/rev/f3032825f637
changeset:   83028:f3032825f637
branch:      2.7
parent:      83020:bf5ff2a58096
parent:      83027:be0586ebb842
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Mar 30 15:31:31 2013 -0400
summary:
  merge 2.7.4 release branch

files:
  Lib/test/pickletester.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -11,7 +11,7 @@
     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
 

-- 
Repository URL: http://hg.python.org/cpython