|
@@ -186,12 +186,15 @@ endif
|
186
|
186
|
|
187
|
187
|
if exists("python_highlight_string_format") && python_highlight_string_format != 0
|
188
|
188
|
" str.format syntax
|
189
|
|
- syn match pythonStrFormat "{\([a-zA-Z_][a-zA-Z0-9_]*\|\d\+\)\(\.[a-zA-Z_][a-zA-Z0-9_]*\|\[\(\d\+\|[^!:\}]\+\)\]\)*\(![rs]\)\=\(:\({\([a-zA-Z_][a-zA-Z0-9_]*\|\d\+\)}\|\([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*\(\.\d\+\)\=[bcdeEfFgGnoxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
|
|
189
|
+ syn match pythonStrFormat "{{\|}}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
|
|
190
|
+ syn match pythonStrFormat "{\([a-zA-Z_][a-zA-Z0-9_]*\|\d\+\)\(\.[a-zA-Z_][a-zA-Z0-9_]*\|\[\(\d\+\|[^!:\}]\+\)\]\)*\(![rsa]\)\=\(:\({\([a-zA-Z_][a-zA-Z0-9_]*\|\d\+\)}\|\([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*\(\.\d\+\)\=[bcdeEfFgGnoxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
|
190
|
191
|
endif
|
191
|
192
|
|
192
|
193
|
if exists("python_highlight_string_templates") && python_highlight_string_templates != 0
|
193
|
194
|
" String templates
|
194
|
|
- syn match pythonStrTemplate "\$\(\$\|{[a-zA-Z_][a-zA-Z0-9_]*}\|[a-zA-Z_][a-zA-Z0-9_]*\)" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
|
|
195
|
+ syn match pythonStrTemplate "\$\$" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
|
|
196
|
+ syn match pythonStrTemplate "\${[a-zA-Z_][a-zA-Z0-9_]*}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
|
|
197
|
+ syn match pythonStrTemplate "\$[a-zA-Z_][a-zA-Z0-9_]*" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
|
195
|
198
|
endif
|
196
|
199
|
|
197
|
200
|
if exists("python_highlight_doctests") && python_highlight_doctests != 0
|
|
@@ -252,7 +255,7 @@ if exists("python_highlight_exceptions") && python_highlight_exceptions != 0
|
252
|
255
|
syn keyword pythonExClass SystemError SystemExit TypeError
|
253
|
256
|
syn keyword pythonExClass UnboundLocalError UnicodeError
|
254
|
257
|
syn keyword pythonExClass UnicodeEncodeError UnicodeDecodeError
|
255
|
|
- syn keyword pythonExClass UnicodeTranslateError ValueError
|
|
258
|
+ syn keyword pythonExClass UnicodeTranslateError ValueError VMSError
|
256
|
259
|
syn keyword pythonExClass WindowsError ZeroDivisionError
|
257
|
260
|
|
258
|
261
|
syn keyword pythonExClass Warning UserWarning BytesWarning DeprecationWarning
|