commit e431d3c9aadb52dd1eea4d1e606e94f1c8471459
author Serhiy Storchaka <storchaka@gmail.com> Sun Mar 20 23:36:29 2016 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Sun Mar 20 23:36:29 2016 +0200
tree 5154063f2e6048881fa88675efd6dfb4bd2f5c4f
parent 97eee1cfda602df25866a6a62796f675caf52323

Issue #26581: Use the first coding cookie on a line, not the last one.

Lib/lib2to3/pgen2/tokenize.py

diff --git a/Lib/lib2to3/pgen2/tokenize.py b/Lib/lib2to3/pgen2/tokenize.py
index 1ff1c61..d14db60 100644
--- a/Lib/lib2to3/pgen2/tokenize.py
+++ b/Lib/lib2to3/pgen2/tokenize.py
@@ -236,7 +236,7 @@
                 startline = False
             toks_append(tokval)
 
-cookie_re = re.compile(r'^[ \t\f]*#.*coding[:=][ \t]*([-\w.]+)', re.ASCII)
+cookie_re = re.compile(r'^[ \t\f]*#.*?coding[:=][ \t]*([-\w.]+)', re.ASCII)
 blank_re = re.compile(br'^[ \t\f]*(?:[#\r\n]|$)', re.ASCII)
 
 def _get_normal_name(orig_enc):