mirror of https://github.com/python/cpython
Issue #14958: backport to 2.7.x from 3.3 (patch by Roger Serwy)
This commit is contained in:
parent
cef2006eaf
commit
10e93a6d40
|
@ -20,10 +20,11 @@ def make_pat():
|
|||
# 1st 'file' colorized normal, 2nd as builtin, 3rd as string
|
||||
builtin = r"([^.'\"\\#]\b|^)" + any("BUILTIN", builtinlist) + r"\b"
|
||||
comment = any("COMMENT", [r"#[^\n]*"])
|
||||
sqstring = r"(\b[rRuU])?'[^'\\\n]*(\\.[^'\\\n]*)*'?"
|
||||
dqstring = r'(\b[rRuU])?"[^"\\\n]*(\\.[^"\\\n]*)*"?'
|
||||
sq3string = r"(\b[rRuU])?'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?"
|
||||
dq3string = r'(\b[rRuU])?"""[^"\\]*((\\.|"(?!""))[^"\\]*)*(""")?'
|
||||
stringprefix = r"(\br|u|ur|R|U|UR|Ur|uR|b|B|br|Br|bR|BR)?"
|
||||
sqstring = stringprefix + r"'[^'\\\n]*(\\.[^'\\\n]*)*'?"
|
||||
dqstring = stringprefix + r'"[^"\\\n]*(\\.[^"\\\n]*)*"?'
|
||||
sq3string = stringprefix + r"'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?"
|
||||
dq3string = stringprefix + r'"""[^"\\]*((\\.|"(?!""))[^"\\]*)*(""")?'
|
||||
string = any("STRING", [sq3string, dq3string, sqstring, dqstring])
|
||||
return kw + "|" + builtin + "|" + comment + "|" + string +\
|
||||
"|" + any("SYNC", [r"\n"])
|
||||
|
|
|
@ -430,6 +430,9 @@ Library
|
|||
- Issue #12157: Make pool.map() empty iterables correctly. Initial
|
||||
patch by mouad.
|
||||
|
||||
- Issue #14958: Change IDLE systax highlighting to recognize all string and byte
|
||||
literals currently supported in Python 2.7.
|
||||
|
||||
- Issue #14962: Update text coloring in IDLE shell window after changing
|
||||
options. Patch by Roger Serwy.
|
||||
|
||||
|
|
Loading…
Reference in New Issue