From fac5d31f34032a5cd81c141170a2056a088ba1b5 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Mon, 5 Mar 2018 00:21:54 -0500
Subject: [PATCH] Adjust that 2.2-2.6 "while" may not have COME_FROM

---
 test/bytecode_2.6/08_distbug.pyc       | Bin 0 -> 615 bytes
 test/simple_source/bug26/08_distbug.py |  13 +++++++++++++
 uncompyle6/parsers/parse26.py          |   1 +
 3 files changed, 14 insertions(+)
 create mode 100644 test/bytecode_2.6/08_distbug.pyc
 create mode 100644 test/simple_source/bug26/08_distbug.py

diff --git a/test/bytecode_2.6/08_distbug.pyc b/test/bytecode_2.6/08_distbug.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e5aa7200926ea7943cff152fa20d9fd959ffa806
GIT binary patch
literal 615
zcmb7B%Ps^#6g}1L(S{bWo<-ZW4Pqf8A_ObREM^uXHl2RdNYULz)$PP2Z15TW#W#pQ
z@da-6V8l*U?x|Dvb?Wi<5q4hRUoLWd4UgADHoL-52o%7xzy%Y5LF}TrU~o3acFblC
z!#!tvxC)@pAjTm`KzVoohIJP+<m0LXy#m35W?ZvJ548tze%E!iY8E<#m@uxo-G>;~
z0)pn+@H|w|k_9|*6-y0b-)V0%oG6=GE32%OQ5um+bD5?2brctJlr|;pMP+Jf8d%@3
z5tr5ak3S+E71Lh5xWid|TA-(E$#-DAv882RUBl!@sdXI@8I?68PmR%rmN={5)TF8}
z$2>bIOKN#Xw8;FI5(Sgk$fT9z8v~;x*M<D{J2e%%Hz)T4l*No_!LBj0s=6s<Vs&G3
zxtTSW+dG?Ey9p~0Z#HhmG|O4-))BkP052522*ol_A04cUUi-a$7wfwNPDTEs6maE!
NrHiJN2d$Xv_X(b;h$#R7

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug26/08_distbug.py b/test/simple_source/bug26/08_distbug.py
new file mode 100644
index 00000000..f85227fe
--- /dev/null
+++ b/test/simple_source/bug26/08_distbug.py
@@ -0,0 +1,13 @@
+# From 2.3.7 dis.py. Bug ranged from 2.2 to 2.6.
+# bug was in "while". uncompyle6 doesn't
+# add in a COME_FROM after the while. Maybe it should?
+
+def distb(tb=None):
+    """Disassemble a traceback (default: last traceback)."""
+    if tb is None:
+        try:
+            tb = sys.last_traceback
+        except AttributeError:
+            raise RuntimeError, "no last traceback to disassemble"
+        while tb.tb_next: tb = tb.tb_next
+    disassemble(tb.tb_frame.f_code, tb.tb_lasti)
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
index 7268ab8e..3a155572 100644
--- a/uncompyle6/parsers/parse26.py
+++ b/uncompyle6/parsers/parse26.py
@@ -139,6 +139,7 @@ class Python26Parser(Python2Parser):
 
         whilestmt      ::= SETUP_LOOP testexpr l_stmts_opt jb_pop POP_BLOCK _come_froms
         whilestmt      ::= SETUP_LOOP testexpr l_stmts_opt jb_cf_pop bp_come_from
+        whilestmt      ::= SETUP_LOOP testexpr l_stmts_opt jb_cf_pop POP_BLOCK
         whilestmt      ::= SETUP_LOOP testexpr returns POP_BLOCK COME_FROM
 
         whileelsestmt  ::= SETUP_LOOP testexpr l_stmts_opt jb_pop POP_BLOCK