Skip to content

Fix for python 3.5#16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ppwwyyxx wants to merge 2 commits into
base:master
Choose a base branch
from
Open

Fix for python 3.5 #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3a6a7e
Fix for python 3.5
ppwwyyxx Dec 20, 2017
78faa50
add a missing star
ppwwyyxx Dec 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions codegen.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,18 @@ def write_comma():
self.visit(default)
if node.vararg is not None:
write_comma()
self.write('*' + node.vararg)
# python 3.5+ compatibility
if hasattr(node.vararg, 'arg'):
self.write('*' + node.vararg.arg)
else:
self.write('*' + node.vararg)
if node.kwarg is not None:
write_comma()
self.write('**' + node.kwarg)
# python 3.5+ compatibility
if hasattr(node.kwarg, 'arg'):
self.write('**' + node.kwarg.arg)
else:
self.write('**' + node.kwarg)

def decorators(self, node):
for decorator in node.decorator_list:
Expand DownExpand Up@@ -213,11 +221,12 @@ def paren_or_comma():
paren_or_comma()
self.write(keyword.arg + '=')
self.visit(keyword.value)
if node.starargs is not None:
# python 3.5 removes starargs & kwargs
if getattr(node, 'starargs', None) is not None:
paren_or_comma()
self.write('*')
self.visit(node.starargs)
if node.kwargs is not None:
if getattr(node, 'kwargs', None) is not None:
paren_or_comma()
self.write('**')
self.visit(node.kwargs)
Expand DownExpand Up@@ -383,11 +392,11 @@ def write_comma():
write_comma()
self.write(keyword.arg + '=')
self.visit(keyword.value)
if node.starargs is not None:
if getattr(node, 'starargs', None) is not None:
write_comma()
self.write('*')
self.visit(node.starargs)
if node.kwargs is not None:
if getattr(node, 'kwargs', None) is not None:
write_comma()
self.write('**')
self.visit(node.kwargs)
Expand Down