From 87b70cfd130d1b9932a8c6cd56b5ebdd6b0a4787 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 15 Apr 2018 14:15:25 -0400
Subject: [PATCH] Plough forward on 3.7 CALL_FUNCTION_EX

---
 test/bytecode_3.7/01_class.pyc            | Bin 0 -> 393 bytes
 test/bytecode_3.7/01_named_and_kwargs.pyc | Bin 0 -> 684 bytes
 uncompyle6/parsers/parse36.py             |   3 +++
 3 files changed, 3 insertions(+)
 create mode 100644 test/bytecode_3.7/01_class.pyc
 create mode 100644 test/bytecode_3.7/01_named_and_kwargs.pyc

diff --git a/test/bytecode_3.7/01_class.pyc b/test/bytecode_3.7/01_class.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..563005a98b541c3d52a9a89009a7a917a3cc99fc
GIT binary patch
literal 393
zcmZ?d<>g`kg58=YqWl;c7#@Q-Fu($2H~?|65|D6bNMT4}YyskCrYI1PDTNuxV@_pk
zW{zS?VF_l?WK9ODg9D&x5ZydLMk+%TV+sRM9V1X3(=A3vKTYOa9P#maiMgrq@wd3*
z<8$*<N^?MLp7{8}(!?By%u0qLR-kq;@k?G$zc@3u0H~@szqBYhRX-&)P2a#UJ~=0`
zxLB{CvIt})HxL&y0SOL9FrRogIRV{N1kzc=3?e|jM_3MFv4O<cfdn5A!)yWZL0Un!
f-{N$wNKP#%$;{6KtHWl%Ee;!qXYJr_<zof_e<MW2

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.7/01_named_and_kwargs.pyc b/test/bytecode_3.7/01_named_and_kwargs.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6c3d5505ca9d93b9b5b1847e13d138b0bc56e7a4
GIT binary patch
literal 684
zcmZWly>in)5WYM8ShgcO{0;O}q98yz{)S9&3WjlGr%`jGXiu3N^fz}h!80yX)6(Px
zcm`g8XSkLsui%PZ8AHKpzHj$VxBKnxNgR(D+K=RCdh9dyiw=7mV(<=OKOg~940z#z
z01p`W;47{K1UCZ+VQ}rG9z-y_W~mP&7{kGhNCV{;3}TpQu7YpkE9Y2c!IJ6xED>A&
zX3Jlaf4t?dmdU`4K$W`Eoif%P=1o<px|6L@h5n+fd#LMD*Gm5PBeb2-dFLLes_oX2
z9$Bet`8g|Bm^TGgWUI21R^^>;Y8UGoCEBLU=$PZsY=9UeIN}sx>9TK?&%d)|?0l=r
z!bN{d*>nh~D7$s5(n(g9&6TX1ouCOY)r3S;)kH+JNJD!zq+$;Cw0&ZA)s{-yW@U19
zbg{ZTesT2dxvaBFfy`=<pRO`<X`i-h7fGB-cT!F;-3lZYnnUE=qZo}mp&x<dHf+N;
zqVRC%eBR3@p5vM07mmZfHp~>?I#JY*(C;d9b06bdTF5O)CBocAXYLW*p<4t?!Zeoq
z{nAR(@%!1?$@$0SVs^SrLwP=5%$9wVeZ5_czvJ&Z=*6SgRRgP1z3qo1DW8Yj$4~G{
J5P5<}{5O}Spi=+<

literal 0
HcmV?d00001

diff --git a/uncompyle6/parsers/parse36.py b/uncompyle6/parsers/parse36.py
index 38e437ac..86934269 100644
--- a/uncompyle6/parsers/parse36.py
+++ b/uncompyle6/parsers/parse36.py
@@ -251,10 +251,13 @@ class Python36Parser(Python35Parser):
             if self.version > 3.6:
                 self.addRule("""
                             expr        ::= call_ex_kw3
+                            expr        ::= call_ex_kw
                             call_ex_kw3 ::= expr
                                             build_tuple_unpack_with_call
                                             expr
                                             CALL_FUNCTION_EX
+                            call_ex_kw  ::= expr expr
+                                            build_map_unpack_with_call CALL_FUNCTION_EX
                             """, nop_func)
             pass
         else: