[GR-21590] Update imports.

fangerer · fangerer · commit 5acaa955c165 · 2020-07-14T15:37:21.000Z
PullRequest: graalpython/1111
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test__osx_support.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test__osx_support.txt
@@ -5,6 +5,7 @@
 *graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__override_all_archs
 *graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__remove_original_values
 *graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__remove_universal_flags
+*graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__remove_unsupported_archs
 *graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__save_modified_value
 *graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__save_modified_value_unchanged
 *graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test_get_platform_osx
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_bytes.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_bytes.txt
@@ -33,10 +33,12 @@
 *graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_from_tuple
 *graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_getslice
 *graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_iconcat
+*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_imod
 *graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_iterator_length_hint
 *graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_iterator_pickling
 *graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_join
 *graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_maketrans
+*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_mod
 *graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_nosort
 *graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_obsolete_write_lock
 *graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_ord
@@ -82,9 +84,11 @@
 *graalpython.lib-python.3.test.test_bytes.BytesTest.test_from_ssize
 *graalpython.lib-python.3.test.test_bytes.BytesTest.test_from_tuple
 *graalpython.lib-python.3.test.test_bytes.BytesTest.test_getslice
+*graalpython.lib-python.3.test.test_bytes.BytesTest.test_imod
 *graalpython.lib-python.3.test.test_bytes.BytesTest.test_iterator_pickling
 *graalpython.lib-python.3.test.test_bytes.BytesTest.test_join
 *graalpython.lib-python.3.test.test_bytes.BytesTest.test_maketrans
+*graalpython.lib-python.3.test.test_bytes.BytesTest.test_mod
 *graalpython.lib-python.3.test.test_bytes.BytesTest.test_ord
 *graalpython.lib-python.3.test.test_bytes.BytesTest.test_pickling
 *graalpython.lib-python.3.test.test_bytes.BytesTest.test_repeat
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_tw.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_tw.txt
@@ -1,4 +1,5 @@
 *graalpython.lib-python.3.test.test_codecmaps_tw.TestBIG5Map.test_errorhandle
 *graalpython.lib-python.3.test.test_codecmaps_tw.TestBIG5Map.test_mapping_file
 *graalpython.lib-python.3.test.test_codecmaps_tw.TestBIG5Map.test_mapping_supplemental
+*graalpython.lib-python.3.test.test_codecmaps_tw.TestCP950Map.test_errorhandle
 *graalpython.lib-python.3.test.test_codecmaps_tw.TestCP950Map.test_mapping_supplemental
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_compile.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_compile.txt
@@ -5,6 +5,7 @@
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_dead_blocks_do_not_generate_bytecode
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_duplicate_global_local
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_empty
+*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_exec_with_general_mapping_for_locals
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_float_literals
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_for_distinct_code_objects
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_indentation
@@ -15,6 +16,7 @@
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_none_assignment
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_none_keyword_arg
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_other_newlines
+*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_path_like_objects
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_peephole_opt_unreachable_code_array_access_in_bounds
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_same_filename_used
 *graalpython.lib-python.3.test.test_compile.TestSpecifics.test_sequence_unpacking_error
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_contextlib.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_contextlib.txt
@@ -33,6 +33,7 @@
 *graalpython.lib-python.3.test.test_contextlib.TestContextDecorator.test_typo_enter
 *graalpython.lib-python.3.test.test_contextlib.TestContextDecorator.test_typo_exit
 *graalpython.lib-python.3.test.test_contextlib.TestExitStack.test_body_exception_suppress
+*graalpython.lib-python.3.test.test_contextlib.TestExitStack.test_callback
 *graalpython.lib-python.3.test.test_contextlib.TestExitStack.test_close
 *graalpython.lib-python.3.test.test_contextlib.TestExitStack.test_dont_reraise_RuntimeError
 *graalpython.lib-python.3.test.test_contextlib.TestExitStack.test_enter_context
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_dataclasses.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_dataclasses.txt
@@ -5,6 +5,7 @@
 *graalpython.lib-python.3.test.test_dataclasses.TestCase.test_disallowed_mutable_defaults
 *graalpython.lib-python.3.test.test_dataclasses.TestCase.test_eq_order
 *graalpython.lib-python.3.test.test_dataclasses.TestCase.test_field_default_default_factory_error
+*graalpython.lib-python.3.test.test_dataclasses.TestCase.test_field_repr
 *graalpython.lib-python.3.test.test_dataclasses.TestCase.test_helper_fields_exception
 *graalpython.lib-python.3.test.test_dataclasses.TestCase.test_init_var_default_factory
 *graalpython.lib-python.3.test.test_dataclasses.TestCase.test_init_var_preserve_type
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_format.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_format.txt
@@ -1,10 +1,10 @@
-*graalpython.lib-python.3.test.test_format.FormatTest.test_common_format
-*graalpython.lib-python.3.test.test_format.FormatTest.test_str_format
 *graalpython.lib-python.3.test.test_format.FormatTest.test_bytes_and_bytearray_format
+*graalpython.lib-python.3.test.test_format.FormatTest.test_common_format
+*graalpython.lib-python.3.test.test_format.FormatTest.test_format_class
 *graalpython.lib-python.3.test.test_format.FormatTest.test_nul
 *graalpython.lib-python.3.test.test_format.FormatTest.test_non_ascii
 *graalpython.lib-python.3.test.test_format.FormatTest.test_locale
 *graalpython.lib-python.3.test.test_format.FormatTest.test_optimisations
 *graalpython.lib-python.3.test.test_format.FormatTest.test_precision
 *graalpython.lib-python.3.test.test_format.FormatTest.test_precision_c_limits
-*graalpython.lib-python.3.test.test_format.FormatTest.test_format_class
+*graalpython.lib-python.3.test.test_format.FormatTest.test_str_format
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_fstring.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_fstring.txt
@@ -1,28 +1,29 @@
 *graalpython.lib-python.3.test.test_fstring.TestCase.test__format__lookup
-*graalpython.lib-python.3.test.test_fstring.TestCase.test_docstring
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_assignment
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_ast_compile_time_concat
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_backslash_char
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_call
-*graalpython.lib-python.3.test.test_fstring.TestCase.test_compile_time_concat_errors
-*graalpython.lib-python.3.test.test_fstring.TestCase.test_unterminated_string
-*graalpython.lib-python.3.test.test_fstring.TestCase.test_mismatched_parens
-*graalpython.lib-python.3.test.test_fstring.TestCase.test_compile_time_concat
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_comments
+*graalpython.lib-python.3.test.test_fstring.TestCase.test_compile_time_concat
+*graalpython.lib-python.3.test.test_fstring.TestCase.test_compile_time_concat_errors
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_del
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_dict
+*graalpython.lib-python.3.test.test_fstring.TestCase.test_docstring
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_double_braces
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_empty_format_specifier
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_equal_equal
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_if_conditional
+*graalpython.lib-python.3.test.test_fstring.TestCase.test_leading_trailing_spaces
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_literal
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_literal_eval
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_locals
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_loop
+*graalpython.lib-python.3.test.test_fstring.TestCase.test_mismatched_parens
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_missing_format_spec
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_missing_variable
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_multiple_vars
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_nested_fstrings
+*graalpython.lib-python.3.test.test_fstring.TestCase.test_parens_in_expressions
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_shadowed_global
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_side_effect_order
 *graalpython.lib-python.3.test.test_fstring.TestCase.test_str_format_differences
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_funcattrs.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_funcattrs.txt
@@ -3,6 +3,7 @@
 *graalpython.lib-python.3.test.test_funcattrs.FunctionDictsTest.test_delete___dict__
 *graalpython.lib-python.3.test.test_funcattrs.FunctionDictsTest.test_func_as_dict_key
 *graalpython.lib-python.3.test.test_funcattrs.FunctionDictsTest.test_setting_dict_to_valid
+*graalpython.lib-python.3.test.test_funcattrs.FunctionDictsTest.test_unassigned_dict
 *graalpython.lib-python.3.test.test_funcattrs.FunctionDocstringTest.test_delete_docstring
 *graalpython.lib-python.3.test.test_funcattrs.FunctionPropertiesTest.test___closure__
 *graalpython.lib-python.3.test.test_funcattrs.FunctionPropertiesTest.test___code__
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_functools.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_functools.txt
@@ -2,6 +2,7 @@
 *graalpython.lib-python.3.test.test_functools.TestCachedProperty.test_cached
 *graalpython.lib-python.3.test.test_functools.TestCachedProperty.test_cached_attribute_name_differs_from_func_name
 *graalpython.lib-python.3.test.test_functools.TestCachedProperty.test_doc
+*graalpython.lib-python.3.test.test_functools.TestCachedProperty.test_immutable_dict
 *graalpython.lib-python.3.test.test_functools.TestCachedProperty.test_reuse_same_name
 *graalpython.lib-python.3.test.test_functools.TestCachedProperty.test_set_name_not_called
 *graalpython.lib-python.3.test.test_functools.TestCmpToKeyPy.test_bad_cmp
@@ -152,6 +153,7 @@
 *graalpython.lib-python.3.test.test_functools.TestSingleDispatch.test_classmethod_register
 *graalpython.lib-python.3.test.test_functools.TestSingleDispatch.test_compose_mro
 *graalpython.lib-python.3.test.test_functools.TestSingleDispatch.test_false_meta
+*graalpython.lib-python.3.test.test_functools.TestSingleDispatch.test_invalid_registrations
 *graalpython.lib-python.3.test.test_functools.TestSingleDispatch.test_method_register
 *graalpython.lib-python.3.test.test_functools.TestSingleDispatch.test_mro
 *graalpython.lib-python.3.test.test_functools.TestSingleDispatch.test_mro_conflicts
@@ -172,6 +174,10 @@
 *graalpython.lib-python.3.test.test_functools.TestUpdateWrapper.test_default_update
 *graalpython.lib-python.3.test.test_functools.TestUpdateWrapper.test_default_update_doc
 *graalpython.lib-python.3.test.test_functools.TestUpdateWrapper.test_missing_attributes
+*graalpython.lib-python.3.test.test_functools.TestUpdateWrapper.test_no_update
+*graalpython.lib-python.3.test.test_functools.TestUpdateWrapper.test_selective_update
 *graalpython.lib-python.3.test.test_functools.TestWraps.test_default_update
 *graalpython.lib-python.3.test.test_functools.TestWraps.test_default_update_doc
 *graalpython.lib-python.3.test.test_functools.TestWraps.test_missing_attributes
+*graalpython.lib-python.3.test.test_functools.TestWraps.test_no_update
+*graalpython.lib-python.3.test.test_functools.TestWraps.test_selective_update
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_smtplib.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_smtplib.txt
@@ -9,6 +9,7 @@
 *graalpython.lib-python.3.test.test_smtplib.GeneralTests.testTimeoutDefault
 *graalpython.lib-python.3.test.test_smtplib.GeneralTests.testTimeoutNone
 *graalpython.lib-python.3.test.test_smtplib.GeneralTests.testTimeoutValue
+*graalpython.lib-python.3.test.test_smtplib.GeneralTests.test_debuglevel
 *graalpython.lib-python.3.test.test_smtplib.NonConnectingTests.testNonnumericPort
 *graalpython.lib-python.3.test.test_smtplib.NonConnectingTests.testNotConnected
 *graalpython.lib-python.3.test.test_smtplib.NonConnectingTests.testSockAttributeExists
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_string.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_string.txt
@@ -10,6 +10,7 @@
 *graalpython.lib-python.3.test.test_string.ModuleTest.test_override_convert_field
 *graalpython.lib-python.3.test.test_string.ModuleTest.test_override_format_field
 *graalpython.lib-python.3.test.test_string.ModuleTest.test_override_get_value
+*graalpython.lib-python.3.test.test_string.ModuleTest.test_override_parse
 *graalpython.lib-python.3.test.test_string.ModuleTest.test_vformat_recursion_limit
 *graalpython.lib-python.3.test.test_string.TestTemplate.test_SafeTemplate
 *graalpython.lib-python.3.test.test_string.TestTemplate.test_braced_override
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_tokenize.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_tokenize.txt
@@ -1,5 +1,21 @@
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_additive
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_async
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_basic
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_comparison
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_float
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_function
 *graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_implicit_newline
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_int
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_long
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_method
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_multiplicative
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_non_ascii_identifiers
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_selector
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_shift
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_tabs
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_unary
 *graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_underscore_literals
+*graalpython.lib-python.3.test.test_tokenize.GenerateTokensTest.test_unicode
 *graalpython.lib-python.3.test.test_tokenize.TestDetectEncoding.test_bom_no_cookie
 *graalpython.lib-python.3.test.test_tokenize.TestDetectEncoding.test_cookie_first_line_no_bom
 *graalpython.lib-python.3.test.test_tokenize.TestDetectEncoding.test_cookie_second_line_commented_first_line
@@ -34,8 +50,24 @@
 *graalpython.lib-python.3.test.test_tokenize.TestTokenizerAdheresToPep0263.test_utf8_coding_cookie_and_utf8_bom
 *graalpython.lib-python.3.test.test_tokenize.Test_Tokenize.test__tokenize_decodes_with_specified_encoding
 *graalpython.lib-python.3.test.test_tokenize.Test_Tokenize.test__tokenize_does_not_decode_with_encoding_none
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_additive
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_async
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_basic
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_comparison
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_float
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_function
 *graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_implicit_newline
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_int
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_long
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_method
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_multiplicative
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_non_ascii_identifiers
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_selector
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_shift
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_tabs
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_unary
 *graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_underscore_literals
+*graalpython.lib-python.3.test.test_tokenize.TokenizeTest.test_unicode
 *graalpython.lib-python.3.test.test_tokenize.UntokenizeTest.test_backslash_continuation
 *graalpython.lib-python.3.test.test_tokenize.UntokenizeTest.test_bad_input_order
 *graalpython.lib-python.3.test.test_tokenize.UntokenizeTest.test_iter_compat
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_types.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_types.txt
@@ -17,6 +17,7 @@
 *graalpython.lib-python.3.test.test_types.ClassCreationTests.test_resolve_bases
 *graalpython.lib-python.3.test.test_types.CoroutineTests.test_duck_coro
 *graalpython.lib-python.3.test.test_types.CoroutineTests.test_duck_corogen
+*graalpython.lib-python.3.test.test_types.CoroutineTests.test_duck_gen
 *graalpython.lib-python.3.test.test_types.CoroutineTests.test_non_gen_values
 *graalpython.lib-python.3.test.test_types.CoroutineTests.test_wrapper_object
 *graalpython.lib-python.3.test.test_types.CoroutineTests.test_wrong_args
@@ -36,3 +37,4 @@
 *graalpython.lib-python.3.test.test_types.TypesTests.test_numeric_types
 *graalpython.lib-python.3.test.test_types.TypesTests.test_strings
 *graalpython.lib-python.3.test.test_types.TypesTests.test_truth_values
+*graalpython.lib-python.3.test.test_types.TypesTests.test_type_function
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unicode_file_functions.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unicode_file_functions.txt
@@ -1,10 +1,20 @@
 *graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeFileTests.test_directory
+*graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeFileTests.test_listdir
+*graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeFileTests.test_open
 *graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeFileTests.test_rename
 *graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFCFileTests.test_directory
+*graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFCFileTests.test_listdir
+*graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFCFileTests.test_open
 *graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFCFileTests.test_rename
 *graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFDFileTests.test_directory
+*graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFDFileTests.test_listdir
+*graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFDFileTests.test_open
 *graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFDFileTests.test_rename
 *graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFKCFileTests.test_directory
+*graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFKCFileTests.test_listdir
+*graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFKCFileTests.test_open
 *graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFKCFileTests.test_rename
 *graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFKDFileTests.test_directory
+*graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFKDFileTests.test_listdir
+*graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFKDFileTests.test_open
 *graalpython.lib-python.3.test.test_unicode_file_functions.UnicodeNFKDFileTests.test_rename
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_weakref.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_weakref.txt
@@ -7,7 +7,6 @@
 *graalpython.lib-python.3.test.test_weakref.MappingTestCase.test_make_weak_valued_dict_repr
 *graalpython.lib-python.3.test.test_weakref.MappingTestCase.test_remove_closure
 *graalpython.lib-python.3.test.test_weakref.MappingTestCase.test_threaded_weak_key_dict_copy
-*graalpython.lib-python.3.test.test_weakref.MappingTestCase.test_threaded_weak_key_dict_deepcopy
 *graalpython.lib-python.3.test.test_weakref.MappingTestCase.test_threaded_weak_value_dict_copy
 *graalpython.lib-python.3.test.test_weakref.ReferencesTestCase.test_basic_ref
 *graalpython.lib-python.3.test.test_weakref.ReferencesTestCase.test_callback_gcs
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PRaiseNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PRaiseNode.java
@@ -58,8 +58,8 @@
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.nodes.EncapsulatingNodeReference;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.NodeUtil;
 
 @ImportStatic(PGuards.class)
 @GenerateUncached
@@ -113,7 +113,7 @@ public static PException raise(Node raisingNode, PBaseException exc, boolean wit
         if (raisingNode.isAdoptable()) {
             throw PException.fromObject(exc, raisingNode, withJavaStacktrace);
         } else {
-            throw PException.fromObject(exc, NodeUtil.getCurrentEncapsulatingNode(), withJavaStacktrace);
+            throw PException.fromObject(exc, EncapsulatingNodeReference.getCurrent().get(), withJavaStacktrace);
         }
     }
 
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
diff --git a/mx.graalpython/native-image.properties b/mx.graalpython/native-image.properties
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
