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

[victor.stinner]

https://hg.python.org/cpython/rev/8ac6cc5a0c01
changeset:   100943:8ac6cc5a0c01
parent:      100941:423e2a96189e
parent:      100942:f8398dba48fb
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Apr 12 18:33:54 2016 +0200
summary:
  Merge 3.5

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


diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py
--- a/Lib/test/test_grammar.py
+++ b/Lib/test/test_grammar.py
@@ -1032,7 +1032,7 @@
         # Test ifelse expressions in various cases
         def _checkeval(msg, ret):
             "helper to check that evaluation of expressions is done correctly"
-            print(x)
+            print(msg)
             return ret
 
         # the next line is not allowed anymore

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