From 605721c99525e5ed394377c5a96817aefa81396c Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 7 May 2017 09:10:05 -0400
Subject: [PATCH] Python 3.x control-flow bug...

"pass" statement inside "while True"
---
 test/bytecode_3.1/12_if_while_true_pass.pyc       | Bin 0 -> 447 bytes
 test/bytecode_3.3/12_if_while_true_pass.pyc       | Bin 0 -> 468 bytes
 .../looping/12_if_while_true_pass.py              |  14 ++++++++++++++
 uncompyle6/scanners/scanner3.py                   |   6 +-----
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 test/bytecode_3.1/12_if_while_true_pass.pyc
 create mode 100644 test/bytecode_3.3/12_if_while_true_pass.pyc
 create mode 100644 test/simple_source/looping/12_if_while_true_pass.py

diff --git a/test/bytecode_3.1/12_if_while_true_pass.pyc b/test/bytecode_3.1/12_if_while_true_pass.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0adaa83ab583ef536f285cc54e145084a519576c
GIT binary patch
literal 447
zcmbVG!Ab)$6r42LwYA0Dp1cZ+hb?**5%uJuB0ZD}vMjr?4Q{(>vcVSGTR+_Q(u(5I
z2Q!(x$;+GPUcW2P&n5+al^}gbaDAc@*a5F31V%}VI)x<SIwG)sAh;Kz)e|<r<J&#9
zl9i3Hy2M7nUhw!<U>S#N8ia(6QML|!vPv0rgk^*=EgmJjVyHQgj+nYc2?4?JY)t(z
zaZ`V&h3DrcZ)U#p-D=iG?FXm>pAtDeH<ij<?QNk3Rb3msm=3P4GyR@@&NNw#^(r&D
zbE#STQyR&v%FB6O`bzN%7ZX85Xp6RxgwEmYiDAN-{to>l2<ksEPUzd4eT3VPfg^kY
Dv<OwA

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.3/12_if_while_true_pass.pyc b/test/bytecode_3.3/12_if_while_true_pass.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c25fe3f59e32a60ace22d4b672756c035dad5d80
GIT binary patch
literal 468
zcmbVG!AiqG6rAm<v9(1H(vw#qcu3K+h-gn93etlpNC?T=E~d?PH;XN_H$T8H@LPRv
zqbNPPWM(Jx-o7`V-CjqY96o*sAjhB6B7IG8M??jE0`I^Ri5AAOBr|8?vqRwaTY|eM
zTHav|44-eXk*sWl<r&rj_LS#r1Qz}9n*<?Y`#iSssZ_|IBP=33(C%@}D@K|!LPty;
zqL_eC@m!erUE;cWRddhnCab5u{bSWDqnZcgz$Zjb&rGROS9zPOL0MHs&nJWPi&Vd)
zZ&OXB+Ip3m%(=v@`~f{lt;&j7Rrpfz3U^Ed(Gz<@658K)S8O+rVotd2{^kklKcV(%
M>}3<^DkS1SUu(=;>i_@%

literal 0
HcmV?d00001

diff --git a/test/simple_source/looping/12_if_while_true_pass.py b/test/simple_source/looping/12_if_while_true_pass.py
new file mode 100644
index 00000000..cf3bd1c5
--- /dev/null
+++ b/test/simple_source/looping/12_if_while_true_pass.py
@@ -0,0 +1,14 @@
+# Python 3.3 pyclbr.py
+# Note that Python 3 adds a lot of unecessary "continues"
+# and puts that in for "pass"
+def _readmodule(g, token, path):
+    for tokentype in g:
+        if g:
+            while True:
+                if token:
+                    token = 1
+                elif token:
+                    pass
+                elif tokentype:
+                    token = 7
+            token = 10
diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py
index 31953266..e347bb6b 100644
--- a/uncompyle6/scanners/scanner3.py
+++ b/uncompyle6/scanners/scanner3.py
@@ -338,11 +338,7 @@ class Scanner3(Scanner):
                         (next_opname not in ('END_FINALLY', 'POP_BLOCK',
                                             # Python 3.0 only uses POP_TOP
                                             'POP_TOP'))):
-                        if (self.version >= 3.4 or
-                            (inst.offset not in self.not_continue) or
-                            (tokens[-1].type == 'RETURN_VALUE')):
-                            opname = 'CONTINUE'
-                            pass
+                        opname = 'CONTINUE'
                     else:
                         opname = 'JUMP_BACK'
                         # FIXME: this is a hack to catch stuff like: