From 024a81c053f35a85819ff7746ee8548c2dc181d3 Mon Sep 17 00:00:00 2001 From: rocky Date: Thu, 23 Jul 2020 11:03:43 -0400 Subject: [PATCH] Fix condition sense in except_handler.py reduction --- uncompyle6/parsers/reducecheck/except_handler.py | 4 +++- uncompyle6/semantics/pysource.py | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/uncompyle6/parsers/reducecheck/except_handler.py b/uncompyle6/parsers/reducecheck/except_handler.py index 05b447e3..88cb8895 100644 --- a/uncompyle6/parsers/reducecheck/except_handler.py +++ b/uncompyle6/parsers/reducecheck/except_handler.py @@ -2,13 +2,15 @@ def except_handler(self, lhs, n, rule, ast, tokens, first, last): end_token = tokens[last-1] + + # print("XXX", first, last) # for t in range(first, last): # print(tokens[t]) # print("=" * 30) # FIXME: Figure out why this doesn't work on # bytecode-1.4/anydbm.pyc - if self.version != 1.4: + if self.version == 1.4: return False # Make sure come froms all come from within "except_handler". diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py index 6fd8395e..04bc7379 100644 --- a/uncompyle6/semantics/pysource.py +++ b/uncompyle6/semantics/pysource.py @@ -587,8 +587,7 @@ class SourceWalker(GenericASTTraversal, object): if n == "LOAD_CONST" and repr(n.pattr)[0] == "-": self.prec = 6 - # print(n.kind, p, "<", self.prec) - # print(self.f.getvalue()) + # print("XXX", n.kind, p, "<", self.prec) if p < self.prec: self.write("(") @@ -604,7 +603,6 @@ class SourceWalker(GenericASTTraversal, object): # If expr is yield we want parens. self.prec = PRECEDENCE["yield"] - 1 self.n_expr(node[0]) - p = self.prec else: self.n_expr(node)