From b4c66d4307ae9c32074a7b320e72c0f1fd102636 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Mon, 15 Apr 2019 08:11:31 -0400
Subject: [PATCH] Was missing some 3.7 and 3.7 semantic actions...

Possibly some as a result of the last refactor?
---
 test/bytecode_3.7/04_call_function.pyc | Bin 0 -> 2763 bytes
 test/bytecode_3.8/04_call_function.pyc | Bin 0 -> 2783 bytes
 uncompyle6/scanners/scanner37.py       |   3 ++-
 uncompyle6/scanners/scanner38.py       |   3 ++-
 uncompyle6/semantics/customize3.py     |   2 ++
 uncompyle6/semantics/customize38.py    |   4 ++++
 uncompyle6/semantics/pysource.py       |   1 -
 7 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 test/bytecode_3.7/04_call_function.pyc
 create mode 100644 test/bytecode_3.8/04_call_function.pyc

diff --git a/test/bytecode_3.7/04_call_function.pyc b/test/bytecode_3.7/04_call_function.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..68eda0504e2ba95b1c2be2bdc6a4f090db55c07f
GIT binary patch
literal 2763
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
F{{Yv5L8Jfx

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.8/04_call_function.pyc b/test/bytecode_3.8/04_call_function.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bd5507adf091a148b069d1189fb9cf090cb94739
GIT binary patch
literal 2783
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

literal 0
HcmV?d00001

diff --git a/uncompyle6/scanners/scanner37.py b/uncompyle6/scanners/scanner37.py
index ed079487..d5e095d9 100644
--- a/uncompyle6/scanners/scanner37.py
+++ b/uncompyle6/scanners/scanner37.py
@@ -24,13 +24,14 @@ scanner routine for Python 3.
 
 from __future__ import print_function
 
+from uncompyle6.scanners.scanner36 import Scanner36
 from uncompyle6.scanners.scanner3 import Scanner3
 
 # bytecode verification, verify(), uses JUMP_OPs from here
 from xdis.opcodes import opcode_37 as opc
 JUMP_OPs = opc.JUMP_OPS
 
-class Scanner37(Scanner3):
+class Scanner37(Scanner36):
 
     def __init__(self, show_asm=None):
         Scanner3.__init__(self, 3.7, show_asm)
diff --git a/uncompyle6/scanners/scanner38.py b/uncompyle6/scanners/scanner38.py
index fb6f575e..f8fe0ff6 100644
--- a/uncompyle6/scanners/scanner38.py
+++ b/uncompyle6/scanners/scanner38.py
@@ -24,13 +24,14 @@ scanner routine for Python 3.
 
 from __future__ import print_function
 
+from uncompyle6.scanners.scanner37 import Scanner37
 from uncompyle6.scanners.scanner3 import Scanner3
 
 # bytecode verification, verify(), uses JUMP_OPs from here
 from xdis.opcodes import opcode_38 as opc
 JUMP_OPs = opc.JUMP_OPS
 
-class Scanner38(Scanner3):
+class Scanner38(Scanner37):
 
     def __init__(self, show_asm=None):
         Scanner3.__init__(self, 3.8, show_asm)
diff --git a/uncompyle6/semantics/customize3.py b/uncompyle6/semantics/customize3.py
index 24eec368..45c1095e 100644
--- a/uncompyle6/semantics/customize3.py
+++ b/uncompyle6/semantics/customize3.py
@@ -27,8 +27,10 @@ from uncompyle6.semantics.customize38 import customize_for_version38
 
 def customize_for_version3(self, version):
     TABLE_DIRECT.update({
+        'except_cond2':	( '%|except %c as %c:\n', 1, 5 ),
         'function_def_annotate': ( '\n\n%|def %c%c\n', -1, 0),
         'store_locals': ( '%|# inspect.currentframe().f_locals = __locals__\n', ),
+        'withstmt':     ( '%|with %c:\n%+%c%-', 0, 3),
         })
 
     assert version >= 3.0
diff --git a/uncompyle6/semantics/customize38.py b/uncompyle6/semantics/customize38.py
index ebea328c..472851d6 100644
--- a/uncompyle6/semantics/customize38.py
+++ b/uncompyle6/semantics/customize38.py
@@ -46,8 +46,12 @@ def customize_for_version38(self, version):
             (0, 'expr'), (6, 'store'),
             (7, 'suite_stmts') ),
 
+        'except_handler38': (
+            '%c', (2, 'except_stmts') ),
+
         'except_handler38a': (
             '%c', (-2, 'stmts') ),
+
         'except_ret38a': (
             'return %c', (4, 'expr') ),
         'except_ret38':  ( '%|return %c\n', (1, 'expr') ),
diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py
index f8daa4db..27486200 100644
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -1825,7 +1825,6 @@ class SourceWalker(GenericASTTraversal, object):
         # print(startnode)
         # print(entry[0])
         # print('======')
-
         fmt = entry[0]
         arg = 1
         i = 0