Issue #8641: Update IDLE 3 syntax coloring to recognize b".." and not u"..".

(Patch by Tal Einat)
This commit is contained in:
Ned Deily 2011-12-07 01:08:35 -08:00
parent a9837d8194
commit 2f0ad742b5
3 changed files with 8 additions and 4 deletions

View File

@ -20,10 +20,10 @@ def make_pat():
# 1st 'file' colorized normal, 2nd as builtin, 3rd as string # 1st 'file' colorized normal, 2nd as builtin, 3rd as string
builtin = r"([^.'\"\\#]\b|^)" + any("BUILTIN", builtinlist) + r"\b" builtin = r"([^.'\"\\#]\b|^)" + any("BUILTIN", builtinlist) + r"\b"
comment = any("COMMENT", [r"#[^\n]*"]) comment = any("COMMENT", [r"#[^\n]*"])
sqstring = r"(\b[rRuU])?'[^'\\\n]*(\\.[^'\\\n]*)*'?" sqstring = r"(\b[rRbB])?'[^'\\\n]*(\\.[^'\\\n]*)*'?"
dqstring = r'(\b[rRuU])?"[^"\\\n]*(\\.[^"\\\n]*)*"?' dqstring = r'(\b[rRbB])?"[^"\\\n]*(\\.[^"\\\n]*)*"?'
sq3string = r"(\b[rRuU])?'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?" sq3string = r"(\b[rRbB])?'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?"
dq3string = r'(\b[rRuU])?"""[^"\\]*((\\.|"(?!""))[^"\\]*)*(""")?' dq3string = r'(\b[rRbB])?"""[^"\\]*((\\.|"(?!""))[^"\\]*)*(""")?'
string = any("STRING", [sq3string, dq3string, sqstring, dqstring]) string = any("STRING", [sq3string, dq3string, sqstring, dqstring])
return kw + "|" + builtin + "|" + comment + "|" + string +\ return kw + "|" + builtin + "|" + comment + "|" + string +\
"|" + any("SYNC", [r"\n"]) "|" + any("SYNC", [r"\n"])

View File

@ -256,6 +256,7 @@ Hans Eckardt
Rodolpho Eckhardt Rodolpho Eckhardt
Grant Edwards Grant Edwards
John Ehresman John Ehresman
Tal Einat
Eric Eisner Eric Eisner
Andrew Eland Andrew Eland
Julien Élie Julien Élie

View File

@ -90,6 +90,9 @@ Core and Builtins
Library Library
------- -------
- Issue #8641: Update IDLE 3 syntax coloring to recognize b".." and not u"..".
Patch by Tal Einat.
- tarfile.py: Correctly detect bzip2 compressed streams with blocksizes - tarfile.py: Correctly detect bzip2 compressed streams with blocksizes
other than 900k. other than 900k.