diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-03-20 21:36:29 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-03-20 21:36:29 (GMT) |
| commit | 6d297cbec48e9026ddf31d2ff95df7c182572dc9 (patch) | |
| tree | 77e0dd82cbcfa6c48fffeeb24f6c31ec62510bfa /Lib | |
| parent | cac1d236a24e2755c05103d485a3b42a884b5a45 (diff) | |
| download | cpython-6d297cbec48e9026ddf31d2ff95df7c182572dc9.zip cpython-6d297cbec48e9026ddf31d2ff95df7c182572dc9.tar.gz cpython-6d297cbec48e9026ddf31d2ff95df7c182572dc9.tar.bz2 | |
Issue #26581: Use the first coding cookie on a line, not the last one.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/idlelib/IOBinding.py | 2 | ||||
| -rw-r--r-- | Lib/lib2to3/pgen2/tokenize.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py index ef40715..1233d80 100644 --- a/Lib/idlelib/IOBinding.py +++ b/Lib/idlelib/IOBinding.py @@ -65,7 +65,7 @@ else: encoding = encoding.lower() -coding_re = re.compile(r'^[ \t\f]*#.*coding[:=][ \t]*([-\w.]+)') +coding_re = re.compile(r'^[ \t\f]*#.*?coding[:=][ \t]*([-\w.]+)') blank_re = re.compile(r'^[ \t\f]*(?:[#\r\n]|$)') class EncodingMessage(SimpleDialog): diff --git a/Lib/lib2to3/pgen2/tokenize.py b/Lib/lib2to3/pgen2/tokenize.py index d64a3e6..8cae873 100644 --- a/Lib/lib2to3/pgen2/tokenize.py +++ b/Lib/lib2to3/pgen2/tokenize.py @@ -236,7 +236,7 @@ class Untokenizer: startline = False toks_append(tokval) -cookie_re = re.compile(r'^[ \t\f]*#.*coding[:=][ \t]*([-\w.]+)') +cookie_re = re.compile(r'^[ \t\f]*#.*?coding[:=][ \t]*([-\w.]+)') blank_re = re.compile(r'^[ \t\f]*(?:[#\r\n]|$)') def _get_normal_name(orig_enc): |