From 1b2b45642b421f4088e1b366e3a3d2f24de4e82a Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 22 Mar 2018 23:54:12 -0400
Subject: [PATCH] 3.6 try except-as bug

---
 test/bytecode_3.6/04_try_finally.pyc       | Bin 580 -> 822 bytes
 test/simple_source/bug36/04_try_finally.py |  15 +++++++++++++++
 uncompyle6/semantics/consts.py             |   3 +++
 uncompyle6/semantics/customize.py          |  16 ++++++++++++++++
 4 files changed, 34 insertions(+)

diff --git a/test/bytecode_3.6/04_try_finally.pyc b/test/bytecode_3.6/04_try_finally.pyc
index 8f7ab09f99a4f7a7eb476a89ed278468b6f7bd40..9e859661d401a4e1f9ff23e40cf618ba128e692f 100644
GIT binary patch
delta 356
zcmZuru};G<5WRDpG_gpPr6YoYC9LcS36Mab49!5*B?_^JsE|~Si`uHCL-_-~1PSp2
z@D*P95zb{{;H3ASeedb+zW7IQdlJV&EZ@gB9N-)N6r=YUp*tdyAn^spAer<?QF7^%
zG8xDosVBo6(&+8t6E_tN+Lce75Y7o*MzjzswgrScXihm8m<WB0u;vI$zT!D8S@UN;
zg65E1B=_oHmyIY%>o7~1jdRmZuZ_~BsoTcx4L7sK)Q{>?>sF_}cE?z57E@*Yr}AN@
zY-Ds<sr#~;SWnF>?NQ>F+`%?13N^1yQKa<i`b2;X1t!=hB&Y|}$x^NZQXM&Rp<UaJ
PdEI9R!g*mY6k+lM7x+ab

delta 106
zcmdnSc7(;nn3tDJ^V0gL%}fjoj~S2vkk8-%#Kkf|B84G^v4tUuA%!W08Avmxu%xg8
pX{HpmU<OV0jXsAN`TaDRi`alli#S09-()ssH4YXalY^au3jq5E5h?%x

diff --git a/test/simple_source/bug36/04_try_finally.py b/test/simple_source/bug36/04_try_finally.py
index 1b2d2e49..ce3226e6 100644
--- a/test/simple_source/bug36/04_try_finally.py
+++ b/test/simple_source/bug36/04_try_finally.py
@@ -31,3 +31,18 @@ def handle_read(self):
         return why
 
     return data
+
+# From 3.6 contextlib
+# Bug is indentation of "return exc"
+# Also there are extra statements to remove exec,
+# which we hide (unless doing fragments).
+# Note: The indentation bug may be a result of using improper
+# grammar.
+def __exit__(self, type, value, traceback):
+    try:
+        value()
+    except StopIteration as exc:
+        return exc
+    except RuntimeError as exc:
+        return exc
+    return
diff --git a/uncompyle6/semantics/consts.py b/uncompyle6/semantics/consts.py
index 87b2d068..34ae5152 100644
--- a/uncompyle6/semantics/consts.py
+++ b/uncompyle6/semantics/consts.py
@@ -288,7 +288,10 @@ TABLE_DIRECT = {
     'except':           ( '%|except:\n%+%c%-', 3 ),
     'except_cond1':	    ( '%|except %c:\n', 1 ),
     'except_suite':     ( '%+%c%-%C', 0, (1, maxint, '') ),
+
+    # In Python 3.6, this is more complicated in the presence of "returns"
     'except_suite_finalize':     ( '%+%c%-%C', 1, (3, maxint, '') ),
+
     'pass':	            ( '%|pass\n', ),
     'STORE_FAST':	    ( '%{pattr}', ),
     'kv':		    ( '%c: %c', 3, 1 ),
diff --git a/uncompyle6/semantics/customize.py b/uncompyle6/semantics/customize.py
index df70c43d..c8fb2aad 100644
--- a/uncompyle6/semantics/customize.py
+++ b/uncompyle6/semantics/customize.py
@@ -609,6 +609,22 @@ def customize_for_version(self, is_pypy, version):
 
                 FSTRING_CONVERSION_MAP = {1: '!s', 2: '!r', 3: '!a'}
 
+                def n_except_suite_finalize(node):
+                    if node[1] == 'returns' and self.hide_internal:
+                        # Process node[1] only.
+                        # The code after "returns", e.g. node[3], is dead code.
+                        # Adding it is wrong as it dedents and another
+                        # exception handler "except_stmt" afterwards.
+                        # Note it is also possible that the grammar is wrong here.
+                        # and this should not be "except_stmt".
+                        self.indent_more()
+                        self.preorder(node[1])
+                        self.indent_less()
+                    else:
+                        self.default(node)
+                    self.prune()
+                self.n_except_suite_finalize = n_except_suite_finalize
+
                 def n_formatted_value(node):
                     if node[0] == 'LOAD_CONST':
                         self.write(node[0].attr)