From c397bf6bda6793a7927ce5f153b35d732e12e324 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 19 Apr 2018 19:28:53 -0400
Subject: [PATCH] Generalize 3.7 attribute with LOAD_METHOD

---
 test/bytecode_3.7/03_double_star_unpack.pyc | Bin 0 -> 391 bytes
 test/bytecode_3.7/03_if_elif.pyc            | Bin 0 -> 211 bytes
 test/bytecode_3.7/03_weird26.pyc            | Bin 0 -> 500 bytes
 test/bytecode_3.7/03_while-if-break.pyc     | Bin 0 -> 282 bytes
 test/bytecode_3.7/04_class_kwargs.pyc       | Bin 0 -> 1747 bytes
 uncompyle6/parsers/parse37.py               |   4 +---
 6 files changed, 1 insertion(+), 3 deletions(-)
 create mode 100644 test/bytecode_3.7/03_double_star_unpack.pyc
 create mode 100644 test/bytecode_3.7/03_if_elif.pyc
 create mode 100644 test/bytecode_3.7/03_weird26.pyc
 create mode 100644 test/bytecode_3.7/03_while-if-break.pyc
 create mode 100644 test/bytecode_3.7/04_class_kwargs.pyc

diff --git a/test/bytecode_3.7/03_double_star_unpack.pyc b/test/bytecode_3.7/03_double_star_unpack.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8a56f3771ddd63db853d4d4bb72982b8322ce577
GIT binary patch
literal 391
zcmYjM!Ait15S>Y)R_RJ_`wazgg~gkQ;(agPf>7EfyNFv`5_1p=UOf8=-u(uDz;DRa
z)Bb`dXId9`;JwUydC4T#lgSZKedb^K1p&TUY)esdMev5mfWcSLV8or$sD+kVS+HpF
zUAzIp*prffN-Sw_S6jIhJ83cMZNkV~$W_fVxp)<X8-mY>dgyTqy&%XbP!<;-bRc3G
zv5HtnG>$$11O1%%`=(pl!neWIc2<Se{CsvcFH9RMwx3E@gvYL|A5OdHD1B&npy!Ez
z?tnN~x!CZ98#Z0SbjVT?E%Ln~6jkX~-VF)%9pCc*jIrA%FD4gFYr@)I4s%kn5}9I(
J$0EZFe*qS5NJ{_!

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.7/03_if_elif.pyc b/test/bytecode_3.7/03_if_elif.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..33f5a30a4e12fe89c1437cd25387c1bf993decab
GIT binary patch
literal 211
zcmXwxu?hk)42F}l!l78i$<^_0P{CD12Uiz2mm*#c3fESWb8z)ZTzw^1CttzIR`7>>
z`Tvk)GZ^$Bs{6hlJ_zti;jfrs9ZRMW1Uw>S9lQ4Gmw?AU%}N3(38iea8+xc<4+ZXu
z&NDa09~~K!Ty2}=^hSiZwZU(h13!RO{QkpdBG#SbmV^tRXeO;|Wj0?JTN`R@Jw0Ea
Y`O<~z($Feh$uL4;jv1=HN<^J~0rEXF3;+NC

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.7/03_weird26.pyc b/test/bytecode_3.7/03_weird26.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fbeb123822f7168123db7ef4d2cdad5758b50982
GIT binary patch
literal 500
zcmY*Vy-or_5T4yTjynvE1u<4?cMT9ss0i_g%EHFP!o(1~*<46CIA$ecf)%`gkKr@;
z0{RNqTHPy9IddSvP3HS%CYf)(*~@CR0{lM1uZM31@FT_Fb2+)-ur~|{s8(PA^-}d<
zsT3H64!Zk2>7qB*SZ4O=3jMTaG<p~;HFpE<R_-7?h<H=+G^1>}=CCIWF)ZNm=uIsY
zLJi1eRvUiTQ<rCTE;G5q@WEB4>&;BfN$LXDr*@d6Bh$B&8AYb?G>cp9M)SP?VupmR
zc0GMvS30AieU2tc+VyzOilPTpX3FI^{@D}dh{K*Su({)%IlVQ<d=Cny8Z{eqNRA`X
zye%Asn&d<(3G955Y+eVQ*o@6QrLHV5jJQAn=eell#Y~ZLwG|DWtVDxxY%*8Q$ed)b
ZcmHOCh-ZE$nc!?>Hb+Y9P}NGl{sp1)S#|&b

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.7/03_while-if-break.pyc b/test/bytecode_3.7/03_while-if-break.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..893e9bb5d46df6329fc5967de0734591be7853dd
GIT binary patch
literal 282
zcmZ?d<>g`kg58=Yq7)bz7#@Q-Fu(+4H~?`m50FS<NMUSYh+;@#3TDt`P6nz41CSaJ
z+Zl+9Re(eVUkyVMM*vWDEn^{5ID{`(!&oF#2!!E4bAbAp{9dvG)vg4xqF8eB^9yb<
zRuqAZ0u#S9iZgQya#G`q^Gl18Q}vTd(~V8_4UFT<Gct2hbu-g+lZsLkv-JupZ}FsL
z78m3sR>r3!mZUO++#moX7#NutS%8>>nGHlU6@e`C(_{qG2zwwb7NFcM4x8Nkl+v73
JJFpobBLF{@G=cyC

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.7/04_class_kwargs.pyc b/test/bytecode_3.7/04_class_kwargs.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a8317b70bcb709fd9a9da3bb3958c06502555f3d
GIT binary patch
literal 1747
zcmb_cOK%e~5VqHwWLui@6we|!RV;@TiN~p`T7py|L=G)d(MrhLthZ^}O}4c+w2kN~
zl`0Os@dMz<KjAm{$|-+=3(R=qrYS8TR7>{S>v?=L{$>`+<#7Vzr~fT@>k#rC4|ce)
znTM$=um~b(LW2BD1G-3rBiKF>ET-#Dj|EJ)qOeZ_SI}kR7yF<?Y7wq>fc@OwHQ2-?
zpn?RBpuzzyCKzbB`o^1BWed-%E6r@}WxJUzcj{3RDizUz6$alim{pht7yvOQgwu2O
z5EcLdSnda!k##Bxq9{tjJ1p%vf`E&$QA}tKhnj-LVmctJ)EM;wc0gQ+2^3j(=?rX@
z3^4QURBkA~4Y+v|fO9oKUYSkOC`{B`Whsv0=KEMxF`!r5p==Dp!rb7zgIFeE$w-fU
zre6q!jDvSt^BrAKoy}P4%Y4)W=WxfOMCsy&vFcMj#<|HG=U>T>Y1M3PCNWoOM@I2X
zz0-L7Z06CEfkduT+1!=*;2r`%B!qUw`3GG29eY80oVUYP%())typ@U$VC8y(^Q}&p
z<TnPJE)SxL;w0f*B385bRF-g$#L!ny$ur)Xs5~k$yCb|rYR#j-1T2;VhQ&^I@qAJs
zYd(`$Y4QRt=xB&O-x=)Q0K1X3fG>h{A3^r<UHV8_pJ}?I>8_?-eEYB-X$DmTzg-n4
zt0qQ?ddIvN2Y3I-)govpWC5X*to!u8Vz2q`$w+UF0x{2qXe7o{fN3Me^HHVa0RdsW
zrqXvFU`03R3-WI2BUvQFG8GQoKs!2Qdvt4jB`+EGj7q-=_UtQv8Z?g{wH>JY&}1mA
zt4xMb){3*WR6xCDaYKe#Gi?v+xq1W@9|z|$LdE<IYSxkyU7maiwwk7wP#)uiV#~Y8
zKl!bI>M3cyZM{JKm#v{}t=VoIV;HR>Eo{QE>tVNmFhkQXfTq{spPsb(c>;6^*!3EO
zd`FsKP|-$*Ju5H0dw<DY86+*gsJss+zhL|YUI%(6Y6l*&t{SS?u)_!)OWhH7v^Se~
PiaEm%B#K8pdd2$%vs|MI

literal 0
HcmV?d00001

diff --git a/uncompyle6/parsers/parse37.py b/uncompyle6/parsers/parse37.py
index 4dd15cd8..de5d880a 100644
--- a/uncompyle6/parsers/parse37.py
+++ b/uncompyle6/parsers/parse37.py
@@ -62,9 +62,7 @@ class Python37Parser(Python36Parser):
         # Is there a pattern here?
         attributes ::= IMPORT_FROM ROT_TWO POP_TOP IMPORT_FROM
 
-        # FIXME: generalize and specialize
-        attribute37   ::= LOAD_FAST LOAD_METHOD
-        attribute37   ::= LOAD_NAME LOAD_METHOD
+        attribute37   ::= expr LOAD_METHOD
         expr          ::= attribute37
 
         # FIXME: generalize and specialize