Merge 75f056620ef0cebdd7f305abcb620f663eed4d80 into 69760cb3accce488cc072772ca918ac2cbf384ba

syntax/python.vim

   if !s:Enabled("g:python_print_as_function")
     syn keyword pythonStatement  print
   endif
-  syn keyword pythonImport      as
+  syn keyword pythonImport      as self
   syn match   pythonFunction    "[a-zA-Z_][a-zA-Z0-9_]*" display contained
 else
   syn keyword pythonStatement   as nonlocal None