Skip to content

Commit 02c8cb0

Browse files
fangererfangerer
committed
Merge branch 'master'
2 parents db6bff2 + 5acaa95 commit 02c8cb0

36 files changed

+624
-88
lines changed

‎graalpython/com.oracle.graal.python.test/src/tests/test_slot.py

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
22
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
#
44
# The Universal Permissive License (UPL), Version 1.0
@@ -55,7 +55,45 @@ def test_uninitialized_slot(self):
5555
obj.world
5656
obj.world = "world"
5757
self.assertEqual(obj.world, "world")
58+
59+
def test_dict_and_weakref_are_listed_in_slots(self):
60+
class D: __slots__ = ['__dict__']
61+
self.assertEqual(tuple(D.__slots__), ('__dict__',))
62+
self.assertEqual(tuple(D().__slots__), ('__dict__',))
5863

64+
class WR: __slots__ = ['__weakref__']
65+
self.assertEqual(tuple(WR.__slots__), ('__weakref__',))
66+
self.assertEqual(tuple(WR().__slots__), ('__weakref__',))
5967

68+
class DWR: __slots__ = ['__dict__', '__weakref__']
69+
self.assertEqual(tuple(DWR.__slots__), ('__dict__', '__weakref__',))
70+
self.assertEqual(tuple(DWR().__slots__), ('__dict__', '__weakref__',))
71+
72+
def test_dict_if_slots(self):
73+
class C: __slots__ = ['a']
74+
self.assertEqual(tuple(C.__dict__['__slots__']), ('a',))
75+
76+
def test_slots_are_not_sorted(self):
77+
class C: __slots__ = ['b', 'a']
78+
self.assertEqual(tuple(C.__slots__), ('b', 'a',))
79+
80+
def test_forbidden_slot_names(self):
81+
raised = False
82+
try:
83+
class C:
84+
__slots__ = ['__slots__']
85+
except ValueError:
86+
raised = True
87+
assert raised
88+
89+
raised = False
90+
try:
91+
class C:
92+
v = 1
93+
__slots__ = ['v']
94+
except ValueError:
95+
raised = True
96+
assert raised
97+
6098
if __name__ == "__main__":
6199
unittest.main()

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test__osx_support.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__override_all_archs
66
*graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__remove_original_values
77
*graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__remove_universal_flags
8+
*graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__remove_unsupported_archs
89
*graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__save_modified_value
910
*graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test__save_modified_value_unchanged
1011
*graalpython.lib-python.3.test.test__osx_support.Test_OSXSupport.test_get_platform_osx

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_bytes.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@
3333
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_from_tuple
3434
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_getslice
3535
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_iconcat
36+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_imod
3637
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_iterator_length_hint
3738
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_iterator_pickling
3839
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_join
3940
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_maketrans
41+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_mod
4042
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_nosort
4143
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_obsolete_write_lock
4244
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_ord
@@ -82,9 +84,11 @@
8284
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_from_ssize
8385
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_from_tuple
8486
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_getslice
87+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_imod
8588
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_iterator_pickling
8689
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_join
8790
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_maketrans
91+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_mod
8892
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_ord
8993
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_pickling
9094
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_repeat

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_tw.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
*graalpython.lib-python.3.test.test_codecmaps_tw.TestBIG5Map.test_errorhandle
22
*graalpython.lib-python.3.test.test_codecmaps_tw.TestBIG5Map.test_mapping_file
33
*graalpython.lib-python.3.test.test_codecmaps_tw.TestBIG5Map.test_mapping_supplemental
4+
*graalpython.lib-python.3.test.test_codecmaps_tw.TestCP950Map.test_errorhandle
45
*graalpython.lib-python.3.test.test_codecmaps_tw.TestCP950Map.test_mapping_supplemental

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_compile.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_dead_blocks_do_not_generate_bytecode
66
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_duplicate_global_local
77
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_empty
8+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_exec_with_general_mapping_for_locals
89
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_float_literals
910
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_for_distinct_code_objects
1011
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_indentation
@@ -15,6 +16,7 @@
1516
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_none_assignment
1617
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_none_keyword_arg
1718
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_other_newlines
19+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_path_like_objects
1820
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_peephole_opt_unreachable_code_array_access_in_bounds
1921
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_same_filename_used
2022
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_sequence_unpacking_error

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_contextlib.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
*graalpython.lib-python.3.test.test_contextlib.TestContextDecorator.test_typo_enter
3434
*graalpython.lib-python.3.test.test_contextlib.TestContextDecorator.test_typo_exit
3535
*graalpython.lib-python.3.test.test_contextlib.TestExitStack.test_body_exception_suppress
36+
*graalpython.lib-python.3.test.test_contextlib.TestExitStack.test_callback
3637
*graalpython.lib-python.3.test.test_contextlib.TestExitStack.test_close
3738
*graalpython.lib-python.3.test.test_contextlib.TestExitStack.test_dont_reraise_RuntimeError
3839
*graalpython.lib-python.3.test.test_contextlib.TestExitStack.test_enter_context

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_dataclasses.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*graalpython.lib-python.3.test.test_dataclasses.TestCase.test_disallowed_mutable_defaults
66
*graalpython.lib-python.3.test.test_dataclasses.TestCase.test_eq_order
77
*graalpython.lib-python.3.test.test_dataclasses.TestCase.test_field_default_default_factory_error
8+
*graalpython.lib-python.3.test.test_dataclasses.TestCase.test_field_repr
89
*graalpython.lib-python.3.test.test_dataclasses.TestCase.test_helper_fields_exception
910
*graalpython.lib-python.3.test.test_dataclasses.TestCase.test_init_var_default_factory
1011
*graalpython.lib-python.3.test.test_dataclasses.TestCase.test_init_var_preserve_type

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_descr.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_rich_comparisons
4848
*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_rmul
4949
*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_set_and_no_get
50+
*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_set_class
5051
*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_slices
5152
*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_slots_descriptor
5253
*graalpython.lib-python.3.test.test_descr.ClassPropertiesAndMethods.test_slots_trash

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_format.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
*graalpython.lib-python.3.test.test_format.FormatTest.test_common_format
2-
*graalpython.lib-python.3.test.test_format.FormatTest.test_str_format
31
*graalpython.lib-python.3.test.test_format.FormatTest.test_bytes_and_bytearray_format
2+
*graalpython.lib-python.3.test.test_format.FormatTest.test_common_format
3+
*graalpython.lib-python.3.test.test_format.FormatTest.test_format_class
44
*graalpython.lib-python.3.test.test_format.FormatTest.test_nul
55
*graalpython.lib-python.3.test.test_format.FormatTest.test_non_ascii
66
*graalpython.lib-python.3.test.test_format.FormatTest.test_locale
77
*graalpython.lib-python.3.test.test_format.FormatTest.test_optimisations
88
*graalpython.lib-python.3.test.test_format.FormatTest.test_precision
99
*graalpython.lib-python.3.test.test_format.FormatTest.test_precision_c_limits
10-
*graalpython.lib-python.3.test.test_format.FormatTest.test_format_class
10+
*graalpython.lib-python.3.test.test_format.FormatTest.test_str_format

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_fstring.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
*graalpython.lib-python.3.test.test_fstring.TestCase.test__format__lookup
2-
*graalpython.lib-python.3.test.test_fstring.TestCase.test_docstring
32
*graalpython.lib-python.3.test.test_fstring.TestCase.test_assignment
43
*graalpython.lib-python.3.test.test_fstring.TestCase.test_ast_compile_time_concat
54
*graalpython.lib-python.3.test.test_fstring.TestCase.test_backslash_char
65
*graalpython.lib-python.3.test.test_fstring.TestCase.test_call
7-
*graalpython.lib-python.3.test.test_fstring.TestCase.test_compile_time_concat_errors
8-
*graalpython.lib-python.3.test.test_fstring.TestCase.test_unterminated_string
9-
*graalpython.lib-python.3.test.test_fstring.TestCase.test_mismatched_parens
10-
*graalpython.lib-python.3.test.test_fstring.TestCase.test_compile_time_concat
116
*graalpython.lib-python.3.test.test_fstring.TestCase.test_comments
7+
*graalpython.lib-python.3.test.test_fstring.TestCase.test_compile_time_concat
8+
*graalpython.lib-python.3.test.test_fstring.TestCase.test_compile_time_concat_errors
129
*graalpython.lib-python.3.test.test_fstring.TestCase.test_del
1310
*graalpython.lib-python.3.test.test_fstring.TestCase.test_dict
11+
*graalpython.lib-python.3.test.test_fstring.TestCase.test_docstring
1412
*graalpython.lib-python.3.test.test_fstring.TestCase.test_double_braces
1513
*graalpython.lib-python.3.test.test_fstring.TestCase.test_empty_format_specifier
1614
*graalpython.lib-python.3.test.test_fstring.TestCase.test_equal_equal
1715
*graalpython.lib-python.3.test.test_fstring.TestCase.test_if_conditional
16+
*graalpython.lib-python.3.test.test_fstring.TestCase.test_leading_trailing_spaces
1817
*graalpython.lib-python.3.test.test_fstring.TestCase.test_literal
1918
*graalpython.lib-python.3.test.test_fstring.TestCase.test_literal_eval
2019
*graalpython.lib-python.3.test.test_fstring.TestCase.test_locals
2120
*graalpython.lib-python.3.test.test_fstring.TestCase.test_loop
21+
*graalpython.lib-python.3.test.test_fstring.TestCase.test_mismatched_parens
2222
*graalpython.lib-python.3.test.test_fstring.TestCase.test_missing_format_spec
2323
*graalpython.lib-python.3.test.test_fstring.TestCase.test_missing_variable
2424
*graalpython.lib-python.3.test.test_fstring.TestCase.test_multiple_vars
2525
*graalpython.lib-python.3.test.test_fstring.TestCase.test_nested_fstrings
26+
*graalpython.lib-python.3.test.test_fstring.TestCase.test_parens_in_expressions
2627
*graalpython.lib-python.3.test.test_fstring.TestCase.test_shadowed_global
2728
*graalpython.lib-python.3.test.test_fstring.TestCase.test_side_effect_order
2829
*graalpython.lib-python.3.test.test_fstring.TestCase.test_str_format_differences

0 commit comments

Comments
 (0)