From 71e712050131d9aa340da92c8c856a1159e445bf Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Mon, 22 Jan 2018 23:08:20 -0500
Subject: [PATCH] JUMP_BACK and CONTINUE need to be treated more similar...

fixes 148
---
 test/bytecode_2.7/02_ifelsetmtl.pyc        | Bin 0 -> 382 bytes
 test/simple_source/bug27+/02_ifelsetmtl.py |  11 +++++++++++
 uncompyle6/main.py                         |  15 ++++++++++-----
 uncompyle6/parsers/parse27.py              |   1 +
 uncompyle6/scanners/scanner27.py           |   2 +-
 5 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 test/bytecode_2.7/02_ifelsetmtl.pyc
 create mode 100644 test/simple_source/bug27+/02_ifelsetmtl.py

diff --git a/test/bytecode_2.7/02_ifelsetmtl.pyc b/test/bytecode_2.7/02_ifelsetmtl.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fd58064518c5405327354860ec30c3a600f39a76
GIT binary patch
literal 382
zcmb78OG*Pl5Pj975`rUm1wj}PI+BHML<C)DVHQF_hB(uS(H>@;>IQ{mrAP7@-o^{0
zstLHZse1M5`#Ss0hd<woS%uvri8tb$3)H|DFcU(U7Dg(S_OqSeN@Rs4upzu(U=7?o
zT5Jr~Mwea<`V+k6DK#k-PIv)60g{H;gA}HP9-Ra|Z&{VBEi?&x0$t?iG!S$u_CD-O
zoQJmI)K^wW1qt|67_XYnyOP`3S8ntam*dN`(fPPsEu3c;n&55s5r#6^yE;~`l&dPm
kM*^S&%IT0Y@nf2#kKC)|pU8ie2C{wCv~~3EI_ap)79|cv!2kdN

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug27+/02_ifelsetmtl.py b/test/simple_source/bug27+/02_ifelsetmtl.py
new file mode 100644
index 00000000..72fb520b
--- /dev/null
+++ b/test/simple_source/bug27+/02_ifelsetmtl.py
@@ -0,0 +1,11 @@
+# Issue #148 on 2.7
+# Bug is in handling CONTINUE like JUMP_BACK
+# Similar code is probably found in a 2.7 stdlib. mapurl?
+def reduce_url(url):
+    atoms = []
+    for atom in url:
+        if atom == '.':
+            pass  # JUMP_BACK is patched as CONTINUE here
+        elif atom == '..':
+            atoms.push()
+    return atoms
diff --git a/uncompyle6/main.py b/uncompyle6/main.py
index 9fa1e2d7..4da6c2f6 100644
--- a/uncompyle6/main.py
+++ b/uncompyle6/main.py
@@ -1,7 +1,7 @@
 from __future__ import print_function
 import datetime, os, subprocess, sys, tempfile
 
-from uncompyle6 import verify, IS_PYPY
+from uncompyle6 import verify, IS_PYPY, PYTHON_VERSION
 from xdis.code import iscode
 from uncompyle6.disas import check_object_path
 from uncompyle6.semantics import pysource
@@ -156,10 +156,15 @@ def main(in_base, out_base, files, codes, outfile=None,
 
                 # Unbuffer output if possible
                 buffering = -1 if sys.stdout.isatty() else 0
-                t = tempfile.NamedTemporaryFile(mode='w+b',
-                                                buffering=buffering,
-                                                suffix='.py',
-                                                prefix=prefix)
+                if PYTHON_VERSION >= 3.5:
+                    t = tempfile.NamedTemporaryFile(mode='w+b',
+                                                    buffering=buffering,
+                                                    suffix='.py',
+                                                    prefix=prefix)
+                else:
+                    t = tempfile.NamedTemporaryFile(mode='w+b',
+                                                    suffix='.py',
+                                                    prefix=prefix)
                 current_outfile = t.name
                 sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', buffering)
                 tee = subprocess.Popen(["tee", current_outfile],
diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py
index fd59eff2..37abf587 100644
--- a/uncompyle6/parsers/parse27.py
+++ b/uncompyle6/parsers/parse27.py
@@ -131,6 +131,7 @@ class Python27Parser(Python2Parser):
         ifelsestmt        ::= testexpr c_stmts_opt JUMP_FORWARD else_suite COME_FROM
         ifelsestmtc       ::= testexpr c_stmts_opt JUMP_ABSOLUTE else_suitec
         ifelsestmtl       ::= testexpr c_stmts_opt JUMP_BACK else_suitel
+        ifelsestmtl       ::= testexpr c_stmts_opt CONTINUE else_suitel
 
         # Common with 2.6
         return_if_lambda   ::= RETURN_END_IF_LAMBDA COME_FROM
diff --git a/uncompyle6/scanners/scanner27.py b/uncompyle6/scanners/scanner27.py
index 377a27e8..ee571067 100755
--- a/uncompyle6/scanners/scanner27.py
+++ b/uncompyle6/scanners/scanner27.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017 by Rocky Bernstein
+# Copyright (c) 2015-2018 by Rocky Bernstein
 """
 Python 2.7 bytecode ingester.