Merge branch

This commit is contained in:
Florent Xicluna 2012-07-07 12:26:56 +02:00
commit fed2c51eea
3 changed files with 8 additions and 1 deletions

View file

@ -388,7 +388,7 @@ def detect_encoding(readline):
raise SyntaxError(msg)
if bom_found:
if codec.name != 'utf-8':
if encoding != 'utf-8':
# This behaviour mimics the Python interpreter
if filename is None:
msg = 'encoding problem: utf-8'