From 925b6667d760db273b5076f1a68c6c6f49f4e5e4 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 21 Mar 2018 08:01:45 -0400
Subject: [PATCH] 3.6 CALL_FUNCTION_KW handling

---
 test/bytecode_3.6/04_class_kwargs.pyc       | Bin 0 -> 1234 bytes
 test/simple_source/bug36/04_class_kwargs.py |  11 ++++
 uncompyle6/semantics/pysource.py            |  57 +++++++++++++-------
 3 files changed, 49 insertions(+), 19 deletions(-)
 create mode 100644 test/bytecode_3.6/04_class_kwargs.pyc
 create mode 100644 test/simple_source/bug36/04_class_kwargs.py

diff --git a/test/bytecode_3.6/04_class_kwargs.pyc b/test/bytecode_3.6/04_class_kwargs.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f9a4e7fd72a42c6b8f2c0477f7a58599ba0545f0
GIT binary patch
literal 1234
zcmb`G&2AGh5XbHHrg1`3gg_t!Tr2Hmi`2rYsscGw6;ci@64G8qo3&fgZa%Pg361C}
zm3o5r;L79p$|<kFi5VxM310_POP=+vXU4z(cy_zdsP_-PCZ9QD-`LU!aoxmeH_<4j
zc+Qg9lP7$isX&QKriA9F!9*lN@go+6Q}ku+jO=0rxM<?E_t0pTaK(~9aTQ!Lj1m;(
z9=z7Jc=59Jrdzx{=y!{wvXkYhwHZSBA<))vws6`Q4FdQSDwqTpgd<dlIN?WLuv4xo
zYE4y@{8YUN6vHEGt4x%RhJB1?!F0urxlbw+am7NGgcvBshks#<3uK1Tz?@kaAvbgp
z9PFGt-pvPDn%lkjP-nXPUfUK4dNoST$+ax14M}`NEE{MFHbMLee)QP99R;pp%b_;z
z4y>L4fO{g#ty??uStIUh0KRSjU)c9e+wBc=4R%nPOmB6{lkMkQPj}`XvzT~zZs?*V
z0T2!2V|DX_<KNjUP6G7Po(6DrfZjlr$O>*9;9Z&KvmMXo8go^d&T{}mtlmW2RB26(
z;qLyS&a~@QNp7gRD}70IZ<510nne%zE)K@~H&X)Bj)bXWdUJ~m9du1UTX}XlXZOAf
z;M?duCCDk=%amF+5{`dx{M_*|-F@20oWQ>ZKZjQ5$6lkMxTRD40Z;zft7{lxsS6n2
z5aVb6rM(@6zbbvW3gWMgXbkD8;9MxBcMQLek3^RE7ZGhDiKCTT?fsV&{Y>QK?yPP0
Ls5oAM<dXjYp~Ez^

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug36/04_class_kwargs.py b/test/simple_source/bug36/04_class_kwargs.py
new file mode 100644
index 00000000..da90d30a
--- /dev/null
+++ b/test/simple_source/bug36/04_class_kwargs.py
@@ -0,0 +1,11 @@
+# From 3.6 test_abc.py
+# Bug was Reciever() class definition
+import abc
+import unittest
+class TestABCWithInitSubclass(unittest.TestCase):
+    def test_works_with_init_subclass(self):
+        class ReceivesClassKwargs:
+            def __init_subclass__(cls, **kwargs):
+                super().__init_subclass__()
+        class Receiver(ReceivesClassKwargs, abc.ABC, x=1, y=2, z=3):
+            pass
diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py
index 917e48a4..ca4a34f2 100644
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -1664,39 +1664,58 @@ class SourceWalker(GenericASTTraversal, object):
     def print_super_classes3(self, node):
         n = len(node)-1
         if node.kind != 'expr':
+            assert node[n].kind.startswith('CALL_FUNCTION')
+
             kwargs = None
-            # 3.6+ starts having this
             if node[n].kind.startswith('CALL_FUNCTION_KW'):
+                # 3.6+ starts does this
                 kwargs = node[n-1].attr
                 assert isinstance(kwargs, tuple)
-            assert node[n].kind.startswith('CALL_FUNCTION')
-            for i in range(n-2, 0, -1):
-                if not node[i].kind in ['expr', 'LOAD_CLASSNAME']:
-                    break
-                pass
+                i = n - (len(kwargs)+1)
+                j = 1 + n - node[n].attr
+            else:
+                for i in range(n-2, 0, -1):
+                    if not node[i].kind in ['expr', 'LOAD_CLASSNAME']:
+                        break
+                    pass
+
+                if i == n-2:
+                    return
+                i += 2
 
-            if i == n-2:
-                return
             line_separator = ', '
             sep = ''
             self.write('(')
-            j = 0
-            i += 2
             if kwargs:
                 # Last arg is tuple of keyword values: omit
                 l = n - 1
             else:
                 l = n
-            while i < l:
-                # 3.6+ may have this
-                if kwargs:
-                    self.write("%s=" % kwargs[j])
+
+            if kwargs:
+                # 3.6+ does this
+                while j < i:
+                    self.write(sep)
+                    value = self.traverse(node[j])
+                    self.write("%s" % value)
+                    sep = line_separator
                     j += 1
-                value = self.traverse(node[i])
-                i += 1
-                self.write(sep, value)
-                sep = line_separator
-                pass
+
+                j = 0
+                while i < l:
+                    self.write(sep)
+                    value = self.traverse(node[i])
+                    self.write("%s=%s" % (kwargs[j], value))
+                    sep = line_separator
+                    j += 1
+                    i += 1
+            else:
+                while i < l:
+                    value = self.traverse(node[i])
+                    i += 1
+                    self.write(sep, value)
+                    sep = line_separator
+                    pass
             pass
         else:
             self.write('(')