From 24ba5d7f40b861991a0c92fed54415c97f64eb2b Mon Sep 17 00:00:00 2001 From: rocky Date: Sun, 9 Jun 2019 18:20:05 -0400 Subject: [PATCH] One more LOAD_CONST->LOAD_STR remnant and... We're good to go! All function signatures seem to be working! YAY! Credit goes to x0ret --- test/bytecode_3.1/04_def_annotate.pyc | Bin 2449 -> 0 bytes test/bytecode_3.2_run/15_assert.pyc | Bin 809 -> 601 bytes test/bytecode_3.5/04_def_annotate.pyc | Bin 1857 -> 0 bytes test/bytecode_3.7/04_def_annotate.pyc | Bin 1776 -> 0 bytes uncompyle6/semantics/make_function.py | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 test/bytecode_3.1/04_def_annotate.pyc delete mode 100644 test/bytecode_3.5/04_def_annotate.pyc delete mode 100644 test/bytecode_3.7/04_def_annotate.pyc diff --git a/test/bytecode_3.1/04_def_annotate.pyc b/test/bytecode_3.1/04_def_annotate.pyc deleted file mode 100644 index 607ee87a70c191d75037be517495daed26d40912..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2449 zcmb_dO>Y}F5S?AgvMt+5sgKXl%#R+eJKK!q%J$>DH0oSFAHJl);v{&Di}pE)f(+bsXgpZkX!MWp$S zNbwuf`!>BJ8pfnrqz;$fBT{Wr8>Bk)KBjja8nV1eYKzo1sjes^EYuxRJ7RE`)E-?^ zyrQ{xOLHF@^%LKYZdc958EgE)N`$)70q<2KcI~>xWcg%5wU2ZaC ztj~O5CdsJRf;Qr2ByAo#ELYlx%H){CgC5^Y{@fuqp6Cs~5gomW>F7G5h!ZsE!AxJ; zu)*T2DvZC`AY0z1$MYmjc+8S3rn6F~&W0-2Pe)<$!}m|0{g^5}PUqh0C$p;nC&t#I zb1^p*iOou!esy}1IbCnR6vQU};|Dz)lpxwHa1bjli%wtq9{vm%jf+x?Fttht5MmU@ zW6fbr!WNIT$*sZw+v%#Zl?zyG^hH@1EplF3r^jl&c;SSdX#=Bmz^wwA4c~B+nIx+w zVXBQ!{CVaR&Q=ym?-Fm5=XD+s@MVq`4|=3cQgDxj8ppfw!y?J@<$5v9F$3`$%p}uS zvpToux||6u{kcw5@pqxLQ9_DF;cS)kros7Sgg=15JZ6(T`!0NqKzMDX9Y>$oacu?k z&XUp9GRGSVF4041#1_ymaszN{f`3_4B z#1<9_f;R*H98hE*nlr?sPn8ehhjt$E&N)-NhnU8t&Ae0s=PT(^WdsPUbGjVMne}X7 zJvcsRGgzIvVq$o&N~hMO7k^z?Q(mF`&3&5Z3}i`DlTCG+hOP{_UIZ>@X}Hr=eMIXO zrOmU_rRjPeKjdA{*yBOt@agEa&iz5-Yc~oX`DH;Fz>53{(H^sKLp06T72k7=b|e=V z5m$^M-*Yj8kK=u-=E4{r^!S8_u+BzS_<~763$U#hJ8EN^G6&KWOs}zt`#q_XcVUA9 zn2nf3S?;IWpEG6%hAm0qp4q0rcU3Tj2dQNMuDs;S@?)%!yDt5`vfk#l{Lr}@ moJ9IR7dY^EQJ;>VkZiZl&2hUEb)w_eL2EzSkG^dmZu|%F68sjkrhJjkrhJx&zNCbeykAc9i0V06cAzT0qaUX(cu6z-Q7Kk>8H4q(m-GGY-h5?9m5M2-(AU3@? zo--1cD1O6hz6s(zIETiSldWqf+jJt{2XPC;&LxZ{d@FWA>=7oUGJ+Q^I1gahM#esf z1J5`Bx#mwhgm;ki=H0X`l}&A4PU2A#I5u)DbCH&|(q)Dr@q<>H$2iRn5)1GOKL)$6 z8nAoLfMI|J3F{}!HD@|6E$K=%!@IhHSefA_ZGGUtdS&R5MXeDbNVu%}rxBwJd`O+pW z7mo8nx^Sw5bZet(JeCM_;@Yyzl%QQCwN~1=Rw+-5yp*n$70Sr5@YriYc3h}tvZP%N zFVNe#|Fel?ekU#CR8Oj@ENyI0QX8XdX;oMgTNQtW@nJ7B0!o8ca?pd`#7!O7EAiCi z40?MDm$z{EsC4ms5hWMevl)7LB8%C)Yfoe>@?UZxOEJHH`Dc`lKbcm>#v@`=5Ee+w z_+c`?P4~1k2sl>bTApenjYnrxAex-4)9S?vEx`1LZu_}3c92iX z6bo8D8@-U3U51|&k?~_v_8}4szhz*tr>}PTuigUc>tBxmiY>jTd=79L${Av!0{l;Z zu{@34B`LxKZ2t8-Fdxz-ZY~|+s^q6XovN}pJA72AEG^7qe+ApFIWAOcU0|$s0d-=- zg+>-*eSq5Esvx)juX?G?FA;tAzYz5??rqM?bSgP_9nP`iD(rdgx}5)9rA5ur6!8^2 zz6_|T^ga?QcW=JS{Qs2-pdvh?3!frctpFML_jH*(d}INzord^8hnSA0TOU-jnbOug z#mFq)kkxjiy|0IBDP;N%@>T%*r=Z0-#+Y-e#X4M#`Syy9!v(*eL^>wqqrUS`kqbqhS>HLsc2(w< zvOH{47LW1m^Z^~N@$a>=DpQ5m^e&^W{ix2}^{{hy* Bdo}<7 diff --git a/test/bytecode_3.7/04_def_annotate.pyc b/test/bytecode_3.7/04_def_annotate.pyc deleted file mode 100644 index fa138bd460e340d2a5a8349eab1a6589d57244c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1776 zcmb7E&2Aev5GHq5(n^sN*G}x%PSS1C1l>cO1Z__Z0wXR^^MbH0vrzihTqIL!xt+nJp%3b^p9*167nZb z7Of4+9(3~y2u=hMl+$-14|sSUWdYye9Ui}eP}r1YaU<(id_PVtaxkFj*H5w7A_hqE?jrml%)WmBNq!< zD2`fNXsxty9Vw3MN($F0YGp*pJ@%QvcU+_rpcn(kAvO zw+XnGH?=j1RmnFHANsaHpxAIk2R-OMC>YgC(bVV)_<9S5D<~jFPx00wNE@I}`}RmA zy!xr)Lh>|lkv*A!*GHnBOdl=wjMB*$iKS&wo$c`ssy7HaJG`Hb>NrMZ9Fg-4WI0P4Nz|zdONN<5& zKwma|XAip1MnN*l3Dghe!8w7t2_YLJw|*#$J*Y-9hh!G7hOb3om%&E^7~Op|f}yj- zQVS*)<@ht0L^Fe{4#VlCvq<6rbc4p`W$>TwK~5UGiMJ32q0?_a0(BP;F|)wWlw`+m zj+LxWcAwR%$ZPZ5AAwqHm9@&P3ysw-#PS2;ji^h#1J*xGoUMPgi(yzG`tpAv8bG*X z#$-MgjJY0TP-YDjI&*!-er)o3wxg5Fcs%P^NqQRuX1RYprha~ja18Gr9=Hc$LAVG- z1dIXg_<^3$ti>bXtmUp9G?R(a*1UvZ%>RmuWrw0oAwy zR=Y3^pdErc_yec?nI%Nz|407|X{69ayeh1(nJjK(Ws&eKMnd=D@AR?Fy6gw7tSVIP iU-%dp7eAZP_&fxwW(~wz1iuzt4Ohb+?a_^Bt@RI4(taBN diff --git a/uncompyle6/semantics/make_function.py b/uncompyle6/semantics/make_function.py index dc8e50f9..4e1d9614 100644 --- a/uncompyle6/semantics/make_function.py +++ b/uncompyle6/semantics/make_function.py @@ -784,7 +784,7 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None): i = 0 for n in node[0]: if n == 'kwarg': - self.write('%s=' % n[0].pattr) + self.write('%s=' % n[0].attr) self.preorder(n[1]) if i < last: self.write(', ')