From e020f8f9a96b16ad27d24211ffdbdd472ef17e6c Mon Sep 17 00:00:00 2001
From: rocky <rocky@gnu.org>
Date: Fri, 8 Jul 2016 12:02:28 -0400
Subject: [PATCH] 2.5/2.6 RETURN_VALUE bug

---
 test/bytecode_2.5/11_return_val.pyc       | Bin 0 -> 481 bytes
 test/bytecode_2.6/11_return_val.pyc       | Bin 0 -> 481 bytes
 test/simple_source/stmts/11_return_val.py |  13 +++++++++++++
 uncompyle6/scanners/scanner2.py           |   3 ++-
 uncompyle6/scanners/scanner26.py          |   3 ---
 5 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 test/bytecode_2.5/11_return_val.pyc
 create mode 100644 test/bytecode_2.6/11_return_val.pyc
 create mode 100644 test/simple_source/stmts/11_return_val.py

diff --git a/test/bytecode_2.5/11_return_val.pyc b/test/bytecode_2.5/11_return_val.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..48368dbba1d8d8973867874cf764cf327e5eabec
GIT binary patch
literal 481
zcmb79!Ait15Pg$&QHw63;Ms!<J-O^%7s302TS4$rYMVlrHt9BrAgp*;KgB=rH~bpE
zz)4g*8_1h^GjH-H@1F<B+sDgYiJud3yy9z)87hJ#RKTmiz3?<k1=mZj`n}g)T{CQg
zbhQV41G41#mP>?H3_a(P@Fg2zE1(llCGbp81lkDnI~)KVgVqn+i@=QKwZKWHMxmMU
zCRrM@)uLeldjN$QF;2|o#Dta&eXS%L0j*Rv;n<i)8C$4QS}(V*Z)NHQf%e5vbRl~z
zTK6qkJ8fmk3Is4`oSCNMx!h<slyYipXU%jr%Li%QpmLr)@1N{G3-ekJU17t!ejhVt
r0G-kyB{Zg39EnA+U-~bEm2U?pm%GgVJpX5G{P0DmE7!_-FlCM}D2rSP

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.6/11_return_val.pyc b/test/bytecode_2.6/11_return_val.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..11cf163696e2b2c81d3c2993ba97aa8b4b97cdcd
GIT binary patch
literal 481
zcmb79!Ait15Pg$&QHw63;Ms!<J-O^%7s302TS4$rYMVlrHt9BrAgp*;KgG}S;;;Ax
zPNL%3K;F!od6PH!_&iA7-e2xY{G5p66<>4AP!S}d0$v5~g{N66xL$hI@4fcwnqd>9
zt3Bu&kR{KzTq3Mu=sA~!FWCrN0iA#<foFmu&_<x&;Q;6uw0_`T1ZFI+1x_+G3eAi+
z$<mmu77YW~11QXhabhkfCbVqmYbDtTXr;0V$Hp|u*g}=kdbxFdD^o8Bv@eFD3)y4Q
zx^KzaX)9A!Ab>gJ%rqU(<wm=qlv86nYo@bVK1k~ZmGkU*|77=BnAdvf3LD<_`<O8U
q=#&mAp)tkcNGyW=(tjbWd^<R~+-3IX`A=g%e9`I3wQ?Rznd1v!|6C{l

literal 0
HcmV?d00001

diff --git a/test/simple_source/stmts/11_return_val.py b/test/simple_source/stmts/11_return_val.py
new file mode 100644
index 00000000..27b8fc4c
--- /dev/null
+++ b/test/simple_source/stmts/11_return_val.py
@@ -0,0 +1,13 @@
+# 2.5.6 decimal.py
+# Bug on 2.5 and 2.6 by incorrectly changing opcode to
+# RETURN_VALUE to psuedo op: RETURN_END_IF
+def _formatparam(param, value=None, quote=True):
+    if value is not None and len(value) > 0:
+        if isinstance(value, tuple):
+            value = 'a'
+        if quote or param:
+            pass
+        else:
+            return '%s=%s' % (param, value)
+    else:
+        return param
diff --git a/uncompyle6/scanners/scanner2.py b/uncompyle6/scanners/scanner2.py
index ee2072bd..f94a5c38 100755
--- a/uncompyle6/scanners/scanner2.py
+++ b/uncompyle6/scanners/scanner2.py
@@ -720,7 +720,8 @@ class Scanner2(scan.Scanner):
                     self.structs.append({'type':  'if-then',
                                            'start': start,
                                            'end':   rtarget})
-                    self.return_end_ifs.add(pre_rtarget)
+                    if self.version == 2.7 or code[pre_rtarget+1] != self.opc.JUMP_FORWARD:
+                        self.return_end_ifs.add(pre_rtarget)
 
         elif op in self.pop_jump_if_or_pop:
             target = self.get_target(pos, op)
diff --git a/uncompyle6/scanners/scanner26.py b/uncompyle6/scanners/scanner26.py
index 574f9c50..807e85e7 100755
--- a/uncompyle6/scanners/scanner26.py
+++ b/uncompyle6/scanners/scanner26.py
@@ -219,9 +219,6 @@ class Scanner26(scan.Scanner2):
                     pattr = repr(offset + 3 + oparg)
                     if op == self.opc.JUMP_FORWARD:
                         target = self.get_target(offset)
-                        if target > offset and self.code[target] == self.opc.RETURN_VALUE:
-                            # Python 2.5 sometimes has this
-                            op_name = 'JUMP_RETURN'
                         # FIXME: this is a hack to catch stuff like:
                         #   if x: continue
                         # the "continue" is not on a new line.