From ede6eabc40b1d29f93a42c4205fe2b6cce8d5acd Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 8 Apr 2018 05:22:35 -0400
Subject: [PATCH] Slightly Python 3.x handing of subclasses...

which are created via a call to create a subclass.

Should be more general though.
---
 test/bytecode_3.1/04_call_function.pyc       | Bin 3476 -> 4072 bytes
 test/bytecode_3.4_run/04_call_function.pyc   | Bin 1443 -> 2871 bytes
 test/bytecode_3.5_run/04_call_function.pyc   | Bin 2090 -> 2871 bytes
 test/bytecode_3.6_run/04_call_function.pyc   | Bin 1626 -> 2754 bytes
 test/simple_source/bug35/04_call_function.py |  13 ++++++++++++-
 uncompyle6/parsers/parse3.py                 |   7 ++++++-
 uncompyle6/semantics/pysource.py             |   7 ++++---
 7 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/test/bytecode_3.1/04_call_function.pyc b/test/bytecode_3.1/04_call_function.pyc
index ab1ceeb2dce7c0fb87f4e1937213028abcfdb213..9fb34a4498864d56a771801f667da351216a355e 100644
GIT binary patch
delta 584
zcmbtQJ4*vW5T3c5m&d7yiHV7*7ZABh6cH?f_>PD#)atC_?W&P`MDGq1EQHugSP@&r
zRuBS$Kf%skQ7i-t8w)!NcViRMIxw@l-?uy8w{zC@(W@;tx5Pf59}E-fBF6XQJiRPd
zv}5e7TqZDGxtq&NK-$4df}H{*1(+vsH~}CDpq)?-fsuwh>8L?TpeZ0pASozIK+{l`
z!N>rSVNK7l5Po5ped86jRxhL}#3XwTJz{tDMjl4g*;~^O4zd^J7Dw1=_#8)Bf8-T&
zOo_hWMD;y7fH=z%>NU==d$ng;M{YI{uAPESi64|KY6?t*SVd0q^jdj20+^uy1_A-@
zMsQ2I#5A>+EvOl`B@Y=Y$5yEqSpH)1py(`$rxGtQ3>v8a$gGQAYbC4b|7oo>$kb6m
zR&eGHwW;P%-*Qc@RPcASy@2i?YFqn-ZJRp&`mEkneNyLfzGl;OEj|ao=sI4*Z~}$5
pb2oQ6+xVf{xlWmF$hr0izn-&Q5?FLBES&T)uO+L*l{P6J`UQX2h0*{3

delta 172
zcmaDMKSf%>pNE(0zvhXkWCkR_4rDt3aq)eIi3$yjLK7E?FbYrH=E2Is5Ue3G*_H7l
zBim$irbUdrn{P2WGct-!mSefVD6{!Ji!mdk`ebFcKaBd571%d0noPdPK8?|Qat6nJ
zMr$Bjcycu7X+{SSYqJ%XG$W(y<S_0fj4qRZbIY-WxM_%OzR&B$IC(CM&E)m`JZx+r
LH^@ys$gc<haR@D}

diff --git a/test/bytecode_3.4_run/04_call_function.pyc b/test/bytecode_3.4_run/04_call_function.pyc
index b62f39034fcc829543dab1555eb59830448bf03a..bc22314e1c79acb1aa71621373b308489adba815 100644
GIT binary patch
delta 1580
zcmb7Dy>A>v6o0cHcV~O!b8P2qgB>o8QF2Ipe~5x25G5v3Vxzc0+l<ybbN1SMyO+0f
zu@jwi#YLonBD#)(hJS#Lk`htUu3R9ciiD^sd2cRf5<>y2eQ(~pdGmhnYrdcPv9a+-
zaBlkdlV8GHHGrq^!dD^r8d34Nc(U=`;5;Y*H4kb5)FP-0@CckR0M!7sL^6cutidv<
z6?h~doCW2xCaptQ2lWc5SFPC`Y^qgIYrG+@&%@A#ko=PMMMxK*vk2iLh)wkxsHU}Q
zg1+#!HEYo2OQ6=RdL1+cvJUDp3?0x77<v#cG3HKd<H^rIiR$RF=!)6VpW>-#j82?y
z#oFk|{Y_jQed+x$c!zWIh=HgJT&1;i5A}nxiu%6BLf?$}%pr1#1komuy<s857FJ2o
za&e6oyhyB^N{q&6H`Rqb8#5{_lzvC!p8k-;f?a|bV3U@Z{qi@#*e3bkF!&rf+R{5b
zQvYyYlQNFdRLYO}{ulw*NsfJD{PD^yy-rk6umk7=^ab=i=sVDNK?ztH3i!qWVe@mg
zp0S^Cl78v6ds$r8+DWRjsH00yC9w%-+BtS2Ba^J1hco)vU=$mv5<Hv#Y%l9Z@u7?`
z-cRo9PYC}s&MO3SS_sDEWNopRNT4te0E~bG3RA$>;(2^xtL274R1_M`-6$z^QC5x>
zrpaztzn*8@!z9mcAm-R|@U(uDz(yycHfX$f{qIYk66~aiEs|rR)6b3!?TXilX&QXN
zBNsYcz{db>+LG+TSM&&6*6g&rvi@0`$A?L_cWc{5^o-jP4<^2N<p`MyPTBwrDQ{{I
z{SMFfxG9vhQ~E`(s}WbouI1UxN}u*wUe*eOB;{Dn$NLfYf~p{oFfm4FEm2O<n52}m
zl(q~5<k_^2ZZh(CZXPb53HB{X{Y{LNln4zPw_nO~TFOqYdMV3+l=pg3IzF-fCS|4&
z1@coHL%l)LjR{mR5XcG&Y?`ks)9a@CrDF5*xW@K##Lg6Zhe|PXR~Nn1+)0j;jOGE~
zB{O`F+560@FEg7hzrj01lr7C*AdnUR4|J!SCT5KMA3;ANj4#HZ7L)f6FI_I;ecjQ`
zOdA@HW;ZhX&3iqK51MU^_BuK<t>w|GzkRz&=Jq+`6_&0t<H0Pe&*#b3v7CwXlnQ8Q
z?hE{Y&nx-v0V!;b$e>sq{VEnl1AppGE>5vQtX>T&t0EAAx9kR$s$Z|o`y_dFk9Cd8
IoYQds0^P<n@&Et;

delta 127
zcmdlkwwPPx9S<+p-{zfB7g-n>9y1^TAfLejh>PblOjMc2%D@n;DLA=+aX%y5WCNxG
zM&8K_nI1EWPHttM#V9jbf#m_C`ea7d4I=s=Eg-!NjQos6GC*3BXL2x?|Kv%W!jrhU
N*w{ewLX!o!MFA*a8dd-R

diff --git a/test/bytecode_3.5_run/04_call_function.pyc b/test/bytecode_3.5_run/04_call_function.pyc
index 25f663e66e9341229a2078e80ace1917418e9f94..5e2ef8e8a9c691b0e254c20c0b6ab925e1d0ce01 100644
GIT binary patch
delta 959
zcma)4J8u&~5T3pB3&#Nyf|G&}#~6_-AmL$&f+7%wkRkzLs%w_xc9UE<-#NQ$0TGgs
zjG#u_(NF*l6&*blR7jL33Zzhg#E)S1Y$qrZ5~G{hZ}u_YeslY-{Gn2x7#%JC{`T2j
zDFE!kUzS6>fG%&47xkarWp)DC6g&kJ`BCWE;En;y0y_!eF=&m0I}T)-O#`c@yQ;vC
zr@Jb!%w~Yq(%BmDaf8_@=vlxk(93{30Sut&)Yp7NYAiqSMI2=fgFZ{%ki7m%+T^fa
zw022FpRr$(DgDv@PG<G%%zHAg?_?!u=ug?Z<g#{hZ^;$?CHJa()zq*s01>koeFKM<
z831`20S9o2xr=K7Bk&wx9aF?MJR{)RW~S+6k|Wo`*uNh{8!I=LgowqjEFSiUrOap#
zTuwk2Kmqgswg^1N&oaUZk~AH%=2%HqcG_HsNj%|XggKaGF^}S;AeBHAi)75-^n~Xt
zE+l;*0;PE5kmL}he&|U_sWAN#_y-}aa~;7z@y=xTz-7--8bpDj6onKhjl348G$~Tr
zidiQ#xJ2o8#|!%_X~BMdL*fuIx5womS{ibdh%h<ct7uL#)oF(udyV>sMi4BZ%QA)o
z&2C~VMs9Q23Ds)wFo@P1Tg>A&ao&UrCZr<wLn`+YF07)ba`6f#N78*GhJOM5pQO!p
z7^pt;f08z^+$~emyecF$`Ob{=H+hR!Bd+juRNJ1~tZsL>C_SpK3vZ*vBjrr$C;5%J
zBtLjJX~U8cKMt`|Du^Q~E@G)97vI~$iBybe=pXr+oRKZ-dZaL2C}k?SvQ@GF0Js0b
Aw*UYD

delta 150
zcmdlkwn{)noR^pDrQhMGd^QG##|%gS$Y*c>;^J2f6IEWYr7$oAYsyS6VBF8hHrarw
zfRT6dLZ-)zqLW*hXEDl5R$zI+s6LsIbpxaR<V~!_j3$%S*b*4cC%3aLWwf5G%RXNS
mY!(yHKnBJl4Irs0I60Ureey(3kxATKY#`f;WhM)7%L4!f<{=IM

diff --git a/test/bytecode_3.6_run/04_call_function.pyc b/test/bytecode_3.6_run/04_call_function.pyc
index ccdc2666a7fe17f820bacfc7cc3ece5a1722d3ad..ae64294dae93c3dd098375874888c5857e1f6710 100644
GIT binary patch
delta 1301
zcma)5y-yTD6rb7KJq|cNL_7gS?i7`^@Ec;GiAs=IfCdWVHsi802Mc?<=j^N^+2o4D
z(2<aBtW5k1>@7_!Y%DD%CKfiD_(%BO0)kXd?)~=7yqWiVU#H6-PfXnC>FN6Y?X&Z+
zM92?vXca-f3ljeX;OBNGUbn{iNj|hmonCHn67)HJe3*}H5~qKb@KgNsCgG>Wv39{3
z0Q+cgyfNquQUbO!d<<-3;sn?#u&?qO>}z6>*ZA4CAu4UtImyW)vCq$Y$cw83!~~fJ
ziK_tV&X;$zBWu!-_GaIyrj_i2@rI6Oi-oUrBD-Y1r&lv=CUi1;Y&~n;!gmG$p|S?(
zS*XLpFG}us1eBDdG&So+YNQ2Dhe?}mQ%dr9jQL;aLSitsrOkR0db(8i0};9np-t|4
z%IU60vf(P`hxN$m7VAp7o@z1f%lzFgKzWJoO~R(@tua@6EB*^{8_xDaya2jK0dOH_
z0b~{=t^lNDl_<Ju)M-lJ8rx(qJUVX|oU$9oLaGJVk43DD>s$u@lGEy&j=~p0#(ose
zNEu1nkmyokO^?P^Iqc%#-94n=E8zs_9?0K?esINS00eO;Cyv3*EmEi4;Dy#^r&HL1
z4mu|E)zW?UgUDO+!{vvM@^F4(3%q?N_{Hc@;sF3f+GG`yO^vp3kgTDtIB5zghv15B
z<_T#F_F<$;v67%gQV)15u53XMAba*w`bvq=rn-|cFMvcDJLpL6=mC=Mrnxb6B+SbU
z+UhIDY$`7ysijMdVe=W&U5qs%o&>0u8GD|%!L9||wxHcTdyJk4f_>I}lBm1_z9i0s
zv;k&7@(4;a-$S%r=!vVO8Hj(%jw5mxua^P-mYqV44c)yU;v`UW{<<HwU^L`axFfG2
zTt`6eLy*%?!r2_iK0WULpK!4m_-dE+2;Y-`xpL~9a0(2M4-w*iqZWHBq9LlGP%tLd
zrmI$}&l4eERqN7SZirCXFzfIe%05|7@8F+BUPQpL)E#>>mDf&pdr<&IQ!x0kyovT=
lw6qEb5_6MN*+{Wg#CYQI>|SxWw`6viC0a83i)Ev~@CSTV8JYk9

delta 141
zcmX>kdW%QHn3tDJW7giN09FQu#|%h-8OU}3;^HnKks>}(qm`8*m_buwvH;^=Mz+c4
z81oo;C)+aJVicV$!90UeX7WbnYmDlXJ6P5;>QA;{EoC&BypA<N)Es046OdqFEK&rL
bnv8y$e3S2SMozBal4WB9$%;*$%_Ru{2Sy#8

diff --git a/test/simple_source/bug35/04_call_function.py b/test/simple_source/bug35/04_call_function.py
index a4cf5101..9a41deef 100644
--- a/test/simple_source/bug35/04_call_function.py
+++ b/test/simple_source/bug35/04_call_function.py
@@ -1,5 +1,6 @@
 # From sql/schema.py and 3.5 _strptime.py
-# Note that kwargs comes before "positional" args
+# Bug was code not knowing which Python versions
+# have kwargs coming before positional args in code.
 
 # RUNNABLE!
 
@@ -68,3 +69,13 @@ def assertRaisesConversion(self, *args):
 class BlockingIOError(IOError):
     def __init__(self, errno, strerror, characters_written=5):
         super().__init__(errno, strerror)
+
+# From urllib/parse.py
+# Bug was using a subclass made from a call (to namedtuple)
+from collections import namedtuple
+
+class ResultMixin(object):
+    pass
+
+class SplitResult(namedtuple('SplitResult', 'scheme netloc path query fragment'), ResultMixin):
+    pass
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
index c9d4414c..2e54cc16 100644
--- a/uncompyle6/parsers/parse3.py
+++ b/uncompyle6/parsers/parse3.py
@@ -116,9 +116,14 @@ class Python3Parser(PythonParser):
 
         classdef ::= build_class store
 
+        # FIXME: we need to add these because don't detect this properly
+        # in custom rules. Specifically if one of the exprs is CALL_FUNCTION
+        # then we'll mistake that for the final CALL_FUNCTION.
+        # We can fix by triggering on the CALL_FUNCTION op
         # Python3 introduced LOAD_BUILD_CLASS
         # Other definitions are in a custom rule
         build_class ::= LOAD_BUILD_CLASS mkfunc expr call CALL_FUNCTION_3
+        build_class ::= LOAD_BUILD_CLASS mkfunc expr call expr CALL_FUNCTION_4
 
         stmt ::= classdefdeco
         classdefdeco ::= classdefdeco1 store
@@ -423,7 +428,7 @@ class Python3Parser(PythonParser):
                         LOAD_CONST CALL_FUNCTION_n
         build_class ::= LOAD_BUILD_CLASS mkfunc
                         expr
-                        call_function
+                        call
                         CALL_FUNCTION_3
          '''
         # FIXME: I bet this can be simplified
diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py
index 4cd57076..51aae2ed 100644
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -1409,12 +1409,13 @@ class SourceWalker(GenericASTTraversal, object):
                 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']:
+                start = n-2
+                for i in range(start, 0, -1):
+                    if not node[i].kind in ['expr', 'call', 'LOAD_CLASSNAME']:
                         break
                     pass
 
-                if i == n-2:
+                if i == start:
                     return
                 i += 2