ADD_VALUE types

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

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 <h.goebel@crazy-compilers.com>
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -17,24 +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 itertools import zip_longest
-
 from xdis import code_has_star_arg, code_has_star_star_arg, iscode
 
-from uncompyle6.parser import ParserError as ParserError2
 from uncompyle6.scanner import Code
 from uncompyle6.semantics.helper import (
     find_all_globals,
     find_globals_and_nonlocals,
     find_none,
     print_docstring,
-    zip_longest
-)
-from xdis import iscode, code_has_star_arg, code_has_star_star_arg
-
+    zip_longest,
 )
 from uncompyle6.semantics.parser_error import ParserError
-from uncompyle6.show import maybe_show_tree_param_default
 
 
 def make_function2(self, node, is_lambda, nested=1, code_node=None):

uncompyle6/semantics/n_actions.py

@@ -277,9 +277,8 @@ class NonterminalActions:
                         value = elem.attr
                     elif elem.optype == "const" and not isinstance(elem.attr, str):
                         value = elem.attr
->>>>>>> python-3.0-to-3.2
                     else:
-                        value = "%s" % repr(elem.attr)
+                        value = "%s" % repr(elem.pattr)
                 else:
                     assert elem.kind == "ADD_VALUE_VAR"
                     value = "%s" % elem.pattr