Add CallFunc.keywords, instead of putting together args and kwargs in CallFunc.args

This patch improves the similarity with the Python's AST. Until now,
CallFunc.args contained both the positional arguments and the keyword arguments,
which was misleading and always it was required to filter out keywords when working
with arguments.

1 files changed, 6 insertions, 0 deletions

diff --git a/astroid/as_string.py b/astroid/as_string.py
index 01eb7185..e8fd440d 100644
--- a/astroid/as_string.py
+++ b/astroid/as_string.py
@@ -137,8 +137,14 @@ class AsStringVisitor(object):
         """return an astroid.CallFunc node as string"""
         expr_str = node.func.accept(self)
         args = [arg.accept(self) for arg in node.args]
+        if node.keywords:
+            keywords = [kwarg.accept(self) for kwarg in node.keywords]
+        else:
+            keywords = []
+
         if node.starargs:
             args.append('*' + node.starargs.accept(self))
+        args.extend(keywords)
         if node.kwargs:
             args.append('**' + node.kwargs.accept(self))
         return '%s(%s)' % (expr_str, ', '.join(args))