Added support for str.format syntax

CHANGES.txt

     - Added support for new integer literal syntax "0o" and "0b";
     - Added support for string.Template syntax controlled by
       "python_highlight_string_templates" option;
+    - Added support for str.format syntax controlled by
+      "python_highlight_string_format" option;
 
 Revision 2.5.6 (2007-02-04):
 

TODO.txt

 Now
 ===
 
-- Python 3.0 string formatting
-
 Later
 =====
 

python.vim

 "    For highlight string formatting:
 "       python_highlight_string_formatting
 "
-"    For highlight string.Template templates:
+"    For highlight str.format syntax:
+"       python_highlight_string_format
+"
+"    For highlight string.Template syntax:
 "       python_highlight_string_templates
 "
 "    For highlight indentation errors:
   if !exists("python_highlight_string_formatting")
     let python_highlight_string_formatting = 1
   endif
+  if !exists("python_highlight_string_format")
+    let python_highlight_string_format = 1
+  endif
   if !exists("python_highlight_string_templates")
     let python_highlight_string_templates = 1
   endif
 
 if exists("python_highlight_string_formatting") && python_highlight_string_formatting != 0
   " String formatting
-  syn match pythonStrFormat	"%\(([^)]\+)\)\=[-#0 +]*\d*\(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
-  syn match pythonStrFormat	"%[-#0 +]*\(\*\|\d\+\)\=\(\.\(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+  syn match pythonStrFormatting	"%\(([^)]\+)\)\=[-#0 +]*\d*\(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+  syn match pythonStrFormatting	"%[-#0 +]*\(\*\|\d\+\)\=\(\.\(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+endif
+
+if exists("python_highlight_string_format") && python_highlight_string_format != 0
+  " str.format syntax
+  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
 endif
 
 if exists("python_highlight_string_templates") && python_highlight_string_templates != 0
   HiLink pythonUniRawEscape		Special
   HiLink pythonUniRawEscapeError	Error
 
-  HiLink pythonStrFormat	Special
-  HiLink pythonStrTemplate	Special
+  HiLink pythonStrFormatting	Special
+  HiLink pythonStrFormat    	Special
+  HiLink pythonStrTemplate	    Special
 
   HiLink pythonDocTest		Special
   HiLink pythonDocTest2		Special