Support Python 3's keyword-only arguments.

Previously, they would parse correctly in Python 3, but any keyword-only
arguments would be quietly lost, and the user would either get
`TypeError: foo() got an unexpected keyword argument...` or the
confusing behavior of having the keyword argument overwritten with
whatever's in the context with the same name.

1 files changed, 13 insertions, 1 deletions

diff --git a/mako/pyparser.py b/mako/pyparser.py
index fc4db9d..2744022 100644
--- a/mako/pyparser.py
+++ b/mako/pyparser.py
@@ -214,13 +214,25 @@ if _ast:
 
         def visit_FunctionDef(self, node):
             self.listener.funcname = node.name
+
             argnames = [arg_id(arg) for arg in node.args.args]
             if node.args.vararg:
                 argnames.append(arg_stringname(node.args.vararg))
+
+            if compat.py2k:
+                # kw-only args don't exist in Python 2
+                kwargnames = []
+            else:
+                kwargnames = [arg_id(arg) for arg in node.args.kwonlyargs]
             if node.args.kwarg:
-                argnames.append(arg_stringname(node.args.kwarg))
+                kwargnames.append(arg_stringname(node.args.kwarg))
             self.listener.argnames = argnames
             self.listener.defaults = node.args.defaults  # ast
+            self.listener.kwargnames = kwargnames
+            if compat.py2k:
+                self.listener.kwdefaults = []
+            else:
+                self.listener.kwdefaults = node.args.kw_defaults
             self.listener.varargs = node.args.vararg
             self.listener.kwargs = node.args.kwarg