From 69dcbc3482ec361c732fb22bda663712fe2a88ad Mon Sep 17 00:00:00 2001 From: Dmitry Vasiliev Date: Sun, 7 Dec 2008 14:57:38 +0300 Subject: [PATCH] Reorganized keywords --- CHANGES.txt | 2 ++ python3.0.vim | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 648fdbe..5741ffd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,6 +4,8 @@ Revision 3.0.0 (2008-09-?): - Updated support for str.format; - Added new builtins introduced in Python 2.6: "ascii", "exec", "memoryview", "print"; + - Added new keyword "nonlocal"; + - Removed exception "StandardError"; - Removed builtins: "apply", "basestring", "buffer", "callable", "coerce", "execfile", "file", "help", "intern", "long", "raw_input", "reduce", "reload", "unichr", "unicode", "xrange"; diff --git a/python3.0.vim b/python3.0.vim index ca6a304..50098c8 100644 --- a/python3.0.vim +++ b/python3.0.vim @@ -96,16 +96,17 @@ endif " Keywords syn keyword pythonStatement break continue del -syn keyword pythonStatement exec return +syn keyword pythonStatement exec return as syn keyword pythonStatement pass raise syn keyword pythonStatement global assert syn keyword pythonStatement lambda yield syn keyword pythonStatement with nonlocal +syn keyword pythonStatement False None True syn keyword pythonStatement def class nextgroup=pythonFunction skipwhite syn match pythonFunction "[a-zA-Z_][a-zA-Z0-9_]*" display contained syn keyword pythonRepeat for while syn keyword pythonConditional if elif else -syn keyword pythonImport import from as +syn keyword pythonImport import from syn keyword pythonException try except finally syn keyword pythonOperator and in is not or @@ -221,7 +222,7 @@ syn match pythonBinError "\<0[bB][01]*[2-9]\d*\>" display if exists("python_highlight_builtins") && python_highlight_builtins != 0 " Builtin functions, types and objects - syn keyword pythonBuiltinObj True False Ellipsis None NotImplemented + syn keyword pythonBuiltinObj Ellipsis NotImplemented syn keyword pythonBuiltinObj __debug__ __doc__ __file__ __name__ __package__ syn keyword pythonBuiltinFunc __import__ abs all any ascii