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

Wed Feb 15 22:34:42 CET 2012

http://hg.python.org/cpython/rev/49edc16fddb6
changeset: 74967:49edc16fddb6
branch: 3.2
parent: 74963:f3a4c2b34973
parent: 74961:5b8f146103fa
user: Antoine Pitrou <solipsis at pitrou.net>
date: Wed Feb 15 22:31:23 2012 +0100
summary:
 Merge
files:
 Lib/test/test_pep3120.py | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Lib/test/test_pep3120.py b/Lib/test/test_pep3120.py
--- a/Lib/test/test_pep3120.py
+++ b/Lib/test/test_pep3120.py
@@ -20,7 +20,7 @@
 import test.badsyntax_pep3120
 except SyntaxError as msg:
 msg = str(msg)
- self.assertTrue('UTF-8' in msg or 'utf8' in msg)
+ self.assertTrue('Non-UTF-8 code starting with' in msg)
 else:
 self.fail("expected exception didn't occur")
 
-- 
Repository URL: http://hg.python.org/cpython
