summaryrefslogtreecommitdiffstats
path: root/Lib/tokenize.py
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2012-07-07 10:26:56 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2012-07-07 10:26:56 (GMT)
commitfed2c51eea3383ab43e6f64da6e575dd62aa578e (patch)
tree0f942460fea82276c268c2b0757fcb4a670d82ea /Lib/tokenize.py
parent36f8dcde067659cb94a6666d745c103e7251875b (diff)
parent11f0b41e9de3805441ddd4142df9f6b7f4432ca7 (diff)
downloadcpython-fed2c51eea3383ab43e6f64da6e575dd62aa578e.zip
cpython-fed2c51eea3383ab43e6f64da6e575dd62aa578e.tar.gz
cpython-fed2c51eea3383ab43e6f64da6e575dd62aa578e.tar.bz2
Merge branch
Diffstat (limited to 'Lib/tokenize.py')
-rw-r--r--Lib/tokenize.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index 0a53435..d669412 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -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'