From 9fd139a41d8ccd0743bb605189c37813288ace40 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 24 Feb 2024 18:26:37 -0500 Subject: [PATCH] changes from other branches --- test/stdlib/2.6-exclude.sh | 1 + test/stdlib/3.2-exclude.sh | 7 +++++++ test/stdlib/3.3-exclude.sh | 2 +- uncompyle6/semantics/make_function2.py | 20 ++++++++------------ uncompyle6/semantics/make_function3.py | 1 - uncompyle6/semantics/n_actions.py | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/test/stdlib/2.6-exclude.sh b/test/stdlib/2.6-exclude.sh index 5b395032..952579a4 100644 --- a/test/stdlib/2.6-exclude.sh +++ b/test/stdlib/2.6-exclude.sh @@ -18,6 +18,7 @@ SKIP_TESTS=( [test_cd.py]=1 # i# No module cl [test_cl.py]=1 # it fails on its own + [test_cmath.py]=pytest [test_codecmaps_cn.py]=1 # it fails on its own [test_codecmaps_jp.py]=1 # it fails on its own [test_codecmaps_kr.py]=1 # it fails on its own diff --git a/test/stdlib/3.2-exclude.sh b/test/stdlib/3.2-exclude.sh index 5b61dd9b..f80f9ee8 100644 --- a/test/stdlib/3.2-exclude.sh +++ b/test/stdlib/3.2-exclude.sh @@ -1,6 +1,13 @@ SKIP_TESTS=( [test_descr.py]=1 # FIXME: Works on c90ff51? + [test_cmath.py]=1 # FIXME + # AssertionError: rect1000: rect(complex(0.0, 0.0)) + # Expected: complex(0.0, 0.0) + # Received: complex(0.0, -1.0) + # Received value insufficiently close to expected value. + + [test_cmd_line.py]=1 [test_collections.py]=1 [test_concurrent_futures.py]=1 # too long to run over 46 seconds by itself diff --git a/test/stdlib/3.3-exclude.sh b/test/stdlib/3.3-exclude.sh index ea0efb29..b2d0afe8 100644 --- a/test/stdlib/3.3-exclude.sh +++ b/test/stdlib/3.3-exclude.sh @@ -11,7 +11,7 @@ SKIP_TESTS=( [test_itertools.py]=1 [test_buffer.py]=1 # FIXME: Works on c90ff51 - [test_cmath.py]=1 # FIXME: Works on c90ff51 + [test_cmath.py]=pytest [test_atexit.py]=1 # The atexit test starting at 3.3 looks for specific comments in error lines diff --git a/uncompyle6/semantics/make_function2.py b/uncompyle6/semantics/make_function2.py index fb186f4f..030ec54e 100644 --- a/uncompyle6/semantics/make_function2.py +++ b/uncompyle6/semantics/make_function2.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2021 by Rocky Bernstein +# Copyright (c) 2015-2021 2024 by Rocky Bernstein # Copyright (c) 2000-2002 by hartmut Goebel # # This program is free software: you can redistribute it and/or modify @@ -17,20 +17,17 @@ All the crazy things we have to do to handle Python functions in Python before 3.0. The saga of changes continues in 3.0 and above and in other files. """ +from xdis import code_has_star_arg, code_has_star_star_arg, iscode + from uncompyle6.scanner import Code -from uncompyle6.semantics.parser_error import ParserError -from uncompyle6.parser import ParserError as ParserError2 from uncompyle6.semantics.helper import ( - print_docstring, find_all_globals, find_globals_and_nonlocals, find_none, + print_docstring, ) -from xdis import iscode, code_has_star_arg, code_has_star_star_arg +from uncompyle6.semantics.parser_error import ParserError -from itertools import zip_longest - -from uncompyle6.show import maybe_show_tree_param_default def make_function2(self, node, is_lambda, nested=1, code_node=None): """ @@ -40,8 +37,8 @@ def make_function2(self, node, is_lambda, nested=1, code_node=None): def build_param(ast, name, default): """build parameters: - - handle defaults - - handle format tuple parameters + - handle defaults + - handle format tuple parameters """ # if formal parameter is a tuple, the paramater name # starts with a dot (eg. '.1', '.2') @@ -52,7 +49,6 @@ def make_function2(self, node, is_lambda, nested=1, code_node=None): if default: value = self.traverse(default, indent="") - maybe_show_tree_param_default(self.showast, name, value) result = "%s=%s" % (name, value) if result[-2:] == "= ": # default was 'LOAD_CONST None' result += "None" @@ -199,5 +195,5 @@ def make_function2(self, node, is_lambda, nested=1, code_node=None): ast, code.co_name, code._customize, is_lambda=is_lambda, returnNone=rn ) - code._tokens = None # save memory + code._tokens = None # save memory code._customize = None # save memory diff --git a/uncompyle6/semantics/make_function3.py b/uncompyle6/semantics/make_function3.py index 7c2960ee..a7377f61 100644 --- a/uncompyle6/semantics/make_function3.py +++ b/uncompyle6/semantics/make_function3.py @@ -337,7 +337,6 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None): - handle format tuple parameters """ value = self.traverse(default, indent="") - maybe_show_tree_param_default(self.showast, name, value) if annotation: result = "%s: %s=%s" % (name, annotation, value) else: diff --git a/uncompyle6/semantics/n_actions.py b/uncompyle6/semantics/n_actions.py index a1e8d770..83619f77 100644 --- a/uncompyle6/semantics/n_actions.py +++ b/uncompyle6/semantics/n_actions.py @@ -278,7 +278,7 @@ class NonterminalActions: elif elem.optype == "const" and not isinstance(elem.attr, str): value = elem.attr else: - value = "%s" % repr(elem.pattr) + value = "%s" % repr(elem.attr) else: assert elem.kind == "ADD_VALUE_VAR" value = "%s" % elem.pattr