Correct 3.6+ calls with kwargs

NEWS

@@ -6,7 +6,7 @@ uncompyle6 2.14.3 2017-01-19
 - Fix some 2.7 and 2.6 parser bugs
 - Fix whilelse parsing bugs
 - Correct 2.5- decorator parsing
-- grammar for decorators matchies AST more a little better
+- grammar for decorators matches AST a little more
 - better tests in setup.py for running the right version of Python
 - Fix 2.6- parsing of "for .. try/else" ...  with "continue"  inside
 

test/simple_source/bug36/02_kwargs.py

@@ -0,0 +1,5 @@
+# From 3.6 _markupbase _parse_doctype_subset()
+def bug(self, j):
+    self.parse_comment(j, report=0)
+    self.parse_comment(j, report=1, foo=2)
+    self.parse_comment(a, b, report=3)

uncompyle6/semantics/pysource.py

@@ -745,18 +745,47 @@ class SourceWalker(GenericASTTraversal, object):
                         self.default(node)
                     self.n_fstring_single = fstring_single
 
-                    def kwargs_only_36(node):
+                    # def kwargs_only_36(node):
+                    #     keys = node[-1].attr
+                    #     num_kwargs = len(keys)
+                    #     values = node[:num_kwargs]
+                    #     for i, (key, value) in enumerate(zip(keys, values)):
+                    #         self.write(key + '=')
+                    #         self.preorder(value)
+                    #         if i < num_kwargs:
+                    #             self.write(',')
+                    #     self.prune()
+                    #     return
+                    # self.n_kwargs_only_36 = kwargs_only_36
+
+                    def kwargs_36(node):
+                        self.write('(')
                         keys = node[-1].attr
                         num_kwargs = len(keys)
-                        values = node[:num_kwargs]
+                        num_posargs = len(node) - (num_kwargs + 1)
-                        for i, (key, value) in enumerate(zip(keys, values)):
+                        n = len(node)
-                            self.write(key + '=')
+                        assert n >= len(keys)+2
-                            self.preorder(value)
+                        sep = ''
-                            if i < num_kwargs:
+                        # FIXME: adjust output for line breaks?
-                                self.write(',')
+                        for i in range(num_posargs):
+                            self.write(sep)
+                            self.preorder(node[i])
+                            sep = ', '
+
+                        i = num_posargs
+                        j = 0
+                        # FIXME: adjust output for line breaks?
+                        while i < n-1:
+                            self.write(sep)
+                            self.write(keys[j] + '=')
+                            self.preorder(node[i])
+                            i += 1
+                            j += 1
+                        self.write(')')
                         self.prune()
                         return
-                    self.n_kwargs_only_36 = kwargs_only_36
+                    self.n_kwargs_36 = kwargs_36
+
 
                     def return_closure(node):
                         # Nothing should be output here