[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/a4262a3494c0
changeset:   71024:a4262a3494c0
parent:      71021:323cf9acbccd
parent:      71023:d238cc890e55
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jun 27 17:51:44 2011 -0500
summary:
  merge 3.2

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


diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -308,7 +308,7 @@
         self.assertEqual(x.left, n1)
         self.assertEqual(x.op, addop)
         self.assertEqual(x.right, n3)
-        
+
         x = ast.BinOp(1, 2, 3)
         self.assertEqual(x.left, 1)
         self.assertEqual(x.op, 2)

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