Merge branch 'develop' of github.com:klen/python-mode into develop

klen · klen · commit 1479d822bd90 · 2014-03-24T12:38:01.000+07:00
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -623,7 +623,7 @@ Highlight docstrings as pythonDocstring (otherwise as pythonString)
 Python-mode doesn't work
 ------------------------
 
-Open any python file and run ":call pymode#troubleshooting#Test()",
+Open any python file and run ":call pymode#troubleshooting#test()",
 fix the warning or send me the output.
 
 
diff --git a/syntax/python.vim b/syntax/python.vim
@@ -78,7 +78,7 @@ endif
 
     syn keyword pythonStatement def nextgroup=pythonFunction skipwhite
     syn match pythonFunction "\%(\%(def\s\|@\)\s*\)\@<=\h\%(\w\|\.\)*" contained nextgroup=pythonVars
-    syn region pythonVars start="(" end=")" contained contains=pythonParameters transparent keepend
+    syn region pythonVars start="(" skip=+\(".*"\|'.*'\)+ end=")" contained contains=pythonParameters transparent keepend
     syn match pythonParameters "[^,]*" contained contains=pythonParam skipwhite
     syn match pythonParam "[^,]*" contained contains=pythonExtraOperator,pythonLambdaExpr,pythonBuiltinObj,pythonBuiltinType,pythonConstant,pythonString,pythonNumber,pythonBrackets,pythonSelf skipwhite
     syn match pythonBrackets "{[(|)]}" contained skipwhite
