Merge branch 'master' of https://github.com/strin/python-syntax

CHANGES.txt

+Revision 3.6.0 (2015-11-XX):
+
+    - Fix 'async def' highlighting. Patch by Joongi Kim
+    - Add dummy 'pythonInclude' group to avoid crashing standard pyrex.vim.
+      Patch by Antony Lee
+
 Revision 3.5.0 (2015-06-10):
 
     - Add support for 'async ...' and 'await' keywords introduced in

README.rst

 
 - `Andrea Riciputi <https://github.com/mrrech>`_
 - Anton Butanaev
+- `Antony Lee <https://github.com/anntzer>`_
 - Caleb Adamantine
 - `David Briscoe <https://github.com/idbrii>`_
 - `Elizabeth Myers <https://github.com/Elizafox>`_
 - `Ihor Gorobets <https://github.com/iho>`_
 - `Jeroen Ruigrok van der Werven <https://github.com/ashemedai>`_
 - `John Eikenberry <https://github.com/eikenb>`_
+- `Joongi Kim <https://github.com/achimnol>`_
 - `Marc Weber <https://github.com/MarcWeber>`_
 - `Pedro Algarvio <https://github.com/s0undt3ch>`_
 - `Victor Salgado <https://github.com/mcsalgado>`_

syntax/python.vim

 " Current Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
 " Previous Maintainer:  Neil Schemenauer <nas at python dot ca>
 " URL:                  https://github.com/hdima/python-syntax
-" Last Change:          2015-06-10
+" Last Change:          2015-11-01
 " Filenames:            *.py
-" Version:              3.5.0
+" Version:              3.6.0
 "
 " Based on python.vim (from Vim 6.1 distribution)
 " by Neil Schemenauer <nas at python dot ca>
 "
 "   Andrea Riciputi
 "   Anton Butanaev
+"   Antony Lee
 "   Caleb Adamantine
 "   David Briscoe
 "   Elizabeth Myers
 "   Ihor Gorobets
 "   Jeroen Ruigrok van der Werven
 "   John Eikenberry
+"   Joongi Kim
 "   Marc Weber
 "   Pedro Algarvio
 "   Victor Salgado
 syn keyword pythonStatement     def class nextgroup=pythonFunction skipwhite
 syn keyword pythonRepeat        for while
 syn keyword pythonConditional   if elif else
+" The standard pyrex.vim unconditionally removes the pythonInclude group, so
+" we provide a dummy group here to avoid crashing pyrex.vim.
+syn keyword pythonInclude       import
 syn keyword pythonImport        import
 syn keyword pythonException     try except finally
 syn keyword pythonOperator      and in is not or
   syn keyword pythonBoolean     True False
   syn match   pythonFunction    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
   syn keyword pythonStatement   await
-  syn match   pythonStatement   "\<async\s\+def\>" display
+  syn match   pythonStatement   "\<async\s\+def\>" nextgroup=pythonFunction skipwhite
   syn match   pythonStatement   "\<async\s\+with\>" display
   syn match   pythonStatement   "\<async\s\+for\>" display
-  syn match   pythonStatement   "\<async\s\+with\>" display
 endif
 
 "

test.py

 def функция
 class Класс
 
+await
+async def Test
+async with
+async for
+
 # Builtin objects.
 
 True False Ellipsis None NotImplemented