Fix issues after merge (#1823)

slozier · web-flow · commit 5922c5dcb399 · 2024-12-22T20:51:31.000-05:00
* Fix issues after merge

* Disable test on Mono
diff --git a/Src/IronPython.Modules/_operator.cs b/Src/IronPython.Modules/_operator.cs
@@ -23,6 +23,7 @@ namespace IronPython.Modules {
     public static class PythonOperator {
         public const string __doc__ = "Provides programmatic access to various operators (addition, accessing members, etc...)";
 
+        [PythonType]
         public sealed class attrgetter : ICodeFormattable {
             private readonly object[] _names;
 
@@ -40,31 +41,32 @@ public attrgetter([NotNone] params object[] attrs) {
             public PythonTuple __reduce__() => PythonTuple.MakeTuple(DynamicHelpers.GetPythonType(this), PythonTuple.MakeTuple(_names));
 
             [SpecialName]
-            public object Call(CodeContext context, object param) {
+            public object? Call(CodeContext context, object? param) {
                 if (_names.Length == 1) {
                     return GetOneAttr(context, param, _names[0]);
                 }
 
-                object[] res = new object[_names.Length];
+                object?[] res = new object[_names.Length];
                 for (int i = 0; i < _names.Length; i++) {
                     res[i] = GetOneAttr(context, param, _names[i]);
                 }
                 return PythonTuple.MakeTuple(res);
             }
 
-            private static object GetOneAttr(CodeContext context, object param, object val) {
+            private static object? GetOneAttr(CodeContext context, object? param, object val) {
                 if (val is not string s) {
                     throw PythonOps.TypeError("attribute name must be string");
                 }
                 int dotPos = s.IndexOf('.');
                 if (dotPos >= 0) {
-                    object nextParam = GetOneAttr(context, param, s.Substring(0, dotPos));
+                    object? nextParam = GetOneAttr(context, param, s.Substring(0, dotPos));
                     return GetOneAttr(context, nextParam, s.Substring(dotPos + 1));
                 }
                 return PythonOps.GetBoundAttr(context, param, s);
             }
         }
 
+        [PythonType]
         public sealed class itemgetter : ICodeFormattable {
             private readonly object?[] _items;
 
@@ -82,7 +84,7 @@ public itemgetter([NotNone] params object?[] items) {
             public PythonTuple __reduce__() => PythonTuple.MakeTuple(DynamicHelpers.GetPythonType(this), PythonTuple.MakeTuple(_items));
 
             [SpecialName]
-            public object Call(CodeContext/*!*/ context, object param) {
+            public object? Call(CodeContext/*!*/ context, object? param) {
                 if (_items.Length == 1) {
                     return PythonOps.GetIndex(context, param, _items[0]);
                 }
diff --git a/Src/IronPythonTest/Cases/CPythonCasesManifest.ini b/Src/IronPythonTest/Cases/CPythonCasesManifest.ini
@@ -181,9 +181,6 @@ Ignore=true
 Ignore=true
 Reason=ImportError: No module named audioop
 
-[CPython.test_base64] # IronPython.test_base64_stdlib
-Ignore=true
-
 [CPython.test_bdb] # new in 3.6
 Ignore=true
 
diff --git a/Tests/test_base64_stdlib.py b/Tests/test_base64_stdlib.py
diff --git a/Tests/test_io_stdlib.py b/Tests/test_io_stdlib.py
@@ -22,29 +22,20 @@ def load_tests(loader, standard_tests, pattern):
             test.test_io.CIOTest('test_TextIOBase_destructor'), # AssertionError: Lists differ: [1, 2, 3, 2] != [1, 2, 3]
             test.test_io.CIOTest('test_destructor'), # AssertionError: Lists differ: [2, 3, 1, 2] != [1, 2, 3]
             test.test_io.CIOTest('test_flush_error_on_close'), # AssertionError: OSError not raised by close
-            test.test_io.CIOTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
             test.test_io.CIOTest('test_invalid_operations'), # OSError: can't do nonzero cur-relative seeks
-            test.test_io.CIOTest('test_open_handles_NUL_chars'), # ValueError: Illegal characters in path.
-            test.test_io.PyIOTest('test_destructor'), # AssertionError: Lists differ: [2, 3, 1, 2] != [1, 2, 3]
-            test.test_io.PyIOTest('test_flush_error_on_close'), # AssertionError: OSError not raised by close
-            test.test_io.PyIOTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
-            test.test_io.PyIOTest('test_open_handles_NUL_chars'), # ValueError: Illegal characters in path.
             test.test_io.CBufferedReaderTest('test_args_error'), # AssertionError: "BufferedReader" does not match "__init__() takes at most 2 arguments (4 given)"
             test.test_io.CBufferedReaderTest('test_buffering'), # TypeError: BufferedReader() takes at least 0 arguments (2 given)
             test.test_io.CBufferedReaderTest('test_close_error_on_close'), # AssertionError: None is not an instance of <class 'OSError'>
-            test.test_io.CBufferedReaderTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
             test.test_io.CBufferedReaderTest('test_initialization'), # AssertionError: ValueError not raised by read
             test.test_io.CBufferedReaderTest('test_misbehaved_io_read'), # AssertionError: OSError not raised by read
             test.test_io.CBufferedReaderTest('test_nonnormalized_close_error_on_close'), # AssertionError: None is not an instance of <class 'NameError'>
-            test.test_io.CBufferedReaderTest('test_override_destructor'), # AssertionError: Lists differ: [1, 2, 3, 2] != [1, 2, 3]
             test.test_io.CBufferedReaderTest('test_read_non_blocking'), # AssertionError: b'' is not None
             test.test_io.CBufferedReaderTest('test_read_on_closed'), # AssertionError: ValueError not raised by read1
             test.test_io.CBufferedReaderTest('test_readonly_attributes'), # AssertionError: AttributeError not raised
             test.test_io.CBufferedReaderTest('test_uninitialized'), # AssertionError: (<class 'ValueError'>, <class 'AttributeError'>) not raised by read
             test.test_io.PyBufferedReaderTest('test_nonnormalized_close_error_on_close'), # AssertionError: None is not an instance of <class 'NameError'>
             test.test_io.PyBufferedReaderTest('test_read_on_closed'), # AssertionError: ValueError not raised by read1
             test.test_io.CBufferedWriterTest('test_close_error_on_close'), # AssertionError: None is not an instance of <class 'OSError'>
-            test.test_io.CBufferedWriterTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
             test.test_io.CBufferedWriterTest('test_initialization'), # AssertionError: ValueError not raised by write
             test.test_io.CBufferedWriterTest('test_max_buffer_size_removal'), # AssertionError: TypeError not raised
             test.test_io.CBufferedWriterTest('test_nonnormalized_close_error_on_close'), # AssertionError: None is not an instance of <class 'NameError'>
@@ -58,7 +49,6 @@ def load_tests(loader, standard_tests, pattern):
             test.test_io.CBufferedRWPairTest('test_uninitialized'), # TypeError: BufferedRWPair() takes at least 2 arguments (0 given)
             test.test_io.PyBufferedRWPairTest('test_reader_writer_close_error_on_close'), # AssertionError: None is not an instance of <class 'NameError'>
             test.test_io.CBufferedRandomTest('test_close_error_on_close'), # AssertionError: None is not an instance of <class 'OSError'>
-            test.test_io.CBufferedRandomTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
             test.test_io.CBufferedRandomTest('test_max_buffer_size_removal'), # AssertionError: TypeError not raised
             test.test_io.CBufferedRandomTest('test_nonnormalized_close_error_on_close'), # AssertionError: None is not an instance of <class 'NameError'>
             test.test_io.CBufferedRandomTest('test_read_non_blocking'), # AssertionError: b'' is not None
@@ -74,7 +64,6 @@ def load_tests(loader, standard_tests, pattern):
             test.test_io.CTextIOWrapperTest('test_close_error_on_close'), # AssertionError: OSError not raised
             test.test_io.CTextIOWrapperTest('test_encoded_writes'), # UnicodeEncodeError
             test.test_io.CTextIOWrapperTest('test_flush_error_on_close'), # AssertionError: OSError not raised by close
-            test.test_io.CTextIOWrapperTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
             test.test_io.CTextIOWrapperTest('test_initialization'), # AssertionError: ValueError not raised by read
             test.test_io.CTextIOWrapperTest('test_non_text_encoding_codecs_are_rejected'), # AssertionError: LookupError not raised
             test.test_io.CTextIOWrapperTest('test_nonnormalized_close_error_on_close'), # AssertionError: NameError not raised
@@ -93,25 +82,74 @@ def load_tests(loader, standard_tests, pattern):
             test.test_io.CMiscIOTest('test_readinto_buffer_overflow'), # IndexError: Index was outside the bounds of the array.
             test.test_io.CMiscIOTest('test_warn_on_dealloc'), # AssertionError: ResourceWarning not triggered
             test.test_io.CMiscIOTest('test_warn_on_dealloc_fd'), # AssertionError: ResourceWarning not triggered
-            test.test_io.PyMiscIOTest('test_io_after_close'), # AttributeError: 'FileIO' object has no attribute 'read1'
             test.test_io.PyMiscIOTest('test_nonblock_pipe_write_bigbuf'), # AttributeError: 'module' object has no attribute 'fcntl'
             test.test_io.PyMiscIOTest('test_nonblock_pipe_write_smallbuf'), # AttributeError: 'module' object has no attribute 'fcntl'
-            test.test_io.PyMiscIOTest('test_pickling'), # AssertionError: TypeError not raised by _dumps
             test.test_io.PyMiscIOTest('test_warn_on_dealloc'), # AssertionError: ResourceWarning not triggered
             test.test_io.PyMiscIOTest('test_warn_on_dealloc_fd'), # AssertionError: ResourceWarning not triggered
+
+            # BufferError: memoryview: invalid buffer exported from object of type EmptyStruct
+            test.test_io.CIOTest('test_buffered_file_io'),
+            test.test_io.CIOTest('test_raw_bytes_io'),
+            test.test_io.CIOTest('test_raw_file_io'),
+            test.test_io.PyIOTest('test_buffered_file_io'),
+            test.test_io.PyIOTest('test_raw_bytes_io'),
+            test.test_io.PyIOTest('test_raw_file_io'),
+            test.test_io.CBufferedRWPairTest('test_readinto'),
+            test.test_io.PyBufferedRWPairTest('test_readinto'),
+
+            # TODO: these are new in 3.6
+            test.test_io.CIOTest('test_BufferedIOBase_readinto'),
+            test.test_io.CIOTest('test_buffered_readinto_mixin'),
+            test.test_io.CIOTest('test_next_nonsizeable'),
+            test.test_io.CIOTest('test_optional_abilities'),
+            test.test_io.PyIOTest('test_buffered_readinto_mixin'),
+            test.test_io.PyIOTest('test_optional_abilities'),
+            test.test_io.APIMismatchTest('test_RawIOBase_io_in_pyio_match'),
+            test.test_io.APIMismatchTest('test_RawIOBase_pyio_in_io_match'),
+            test.test_io.CBufferedReaderTest('test_readinto1'),
+            test.test_io.CBufferedReaderTest('test_readinto1_array'),
+            test.test_io.CBufferedReaderTest('test_readinto_array'),
+            test.test_io.CBufferedRandomTest('test_readinto1'),
+            test.test_io.CBufferedRandomTest('test_readinto1_array'),
+            test.test_io.CBufferedRandomTest('test_readinto_array'),
+            test.test_io.CTextIOWrapperTest('test_illegal_encoder'),
+            test.test_io.CTextIOWrapperTest('test_issue25862'),
+            test.test_io.CTextIOWrapperTest('test_read_byteslike'),
+            test.test_io.PyTextIOWrapperTest('test_illegal_encoder'),
+            test.test_io.PyTextIOWrapperTest('test_read_byteslike'),
         ]
 
         if is_mono:
             failing_tests += [
-                test.test_io.CBufferedRandomTest('test_destructor'), # IndexError: index out of range: 0
+                test.test_io.PyMiscIOTest('test_create_fail'),
             ]
 
         skip_tests = [
+            test.test_io.CBufferedReaderTest('test_override_destructor'), # StackOverflowException
             test.test_io.CBufferedWriterTest('test_override_destructor'), # StackOverflowException
             test.test_io.CBufferedRandomTest('test_override_destructor'), # StackOverflowException
             test.test_io.CTextIOWrapperTest('test_bufio_write_through'), # StackOverflowException
             test.test_io.CTextIOWrapperTest('test_override_destructor'), # StackOverflowException
 
+            # failure prevents files from closing
+            test.test_io.CIOTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
+            test.test_io.PyIOTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
+            test.test_io.CBufferedReaderTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
+            test.test_io.CBufferedWriterTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
+            test.test_io.CBufferedRandomTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
+            test.test_io.CTextIOWrapperTest('test_garbage_collection'), # AssertionError: filter ('', ResourceWarning) did not catch any warning
+            test.test_io.PyIOTest('test_destructor'), # AssertionError: Lists differ: [2, 3, 1, 2] != [1, 2, 3]
+
+            # StackOverflowException
+            test.test_io.CBufferedReaderTest('test_recursive_repr'),
+            test.test_io.PyBufferedReaderTest('test_recursive_repr'),
+            test.test_io.CBufferedWriterTest('test_recursive_repr'),
+            test.test_io.PyBufferedWriterTest('test_recursive_repr'),
+            test.test_io.CBufferedRandomTest('test_recursive_repr'),
+            test.test_io.PyBufferedRandomTest('test_recursive_repr'),
+            test.test_io.CTextIOWrapperTest('test_recursive_repr'),
+            test.test_io.PyTextIOWrapperTest('test_recursive_repr'),
+
             # __del__ not getting called on shutdown?
             test.test_io.CTextIOWrapperTest('test_create_at_shutdown_with_encoding'),
             test.test_io.CTextIOWrapperTest('test_create_at_shutdown_without_encoding'),

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ namespace IronPython.Modules {`
`23`	`23`	`public static class PythonOperator {`
`24`	`24`	`public const string __doc__ = "Provides programmatic access to various operators (addition, accessing members, etc...)";`
`25`	`25`
	`26`	`+ [PythonType]`
`26`	`27`	`public sealed class attrgetter : ICodeFormattable {`
`27`	`28`	`private readonly object[] _names;`
`28`	`29`
`@@ -40,31 +41,32 @@ public attrgetter([NotNone] params object[] attrs) {`
`40`	`41`	`public PythonTuple __reduce__() => PythonTuple.MakeTuple(DynamicHelpers.GetPythonType(this), PythonTuple.MakeTuple(_names));`
`41`	`42`
`42`	`43`	`[SpecialName]`
`43`		`- public object Call(CodeContext context, object param) {`
	`44`	`+ public object? Call(CodeContext context, object? param) {`
`44`	`45`	`if (_names.Length == 1) {`
`45`	`46`	`return GetOneAttr(context, param, _names[0]);`
`46`	`47`	`}`
`47`	`48`
`48`		`- object[] res = new object[_names.Length];`
	`49`	`+ object?[] res = new object[_names.Length];`
`49`	`50`	`for (int i = 0; i < _names.Length; i++) {`
`50`	`51`	`res[i] = GetOneAttr(context, param, _names[i]);`
`51`	`52`	`}`
`52`	`53`	`return PythonTuple.MakeTuple(res);`
`53`	`54`	`}`
`54`	`55`
`55`		`- private static object GetOneAttr(CodeContext context, object param, object val) {`
	`56`	`+ private static object? GetOneAttr(CodeContext context, object? param, object val) {`
`56`	`57`	`if (val is not string s) {`
`57`	`58`	`throw PythonOps.TypeError("attribute name must be string");`
`58`	`59`	`}`
`59`	`60`	`int dotPos = s.IndexOf('.');`
`60`	`61`	`if (dotPos >= 0) {`
`61`		`- object nextParam = GetOneAttr(context, param, s.Substring(0, dotPos));`
	`62`	`+ object? nextParam = GetOneAttr(context, param, s.Substring(0, dotPos));`
`62`	`63`	`return GetOneAttr(context, nextParam, s.Substring(dotPos + 1));`
`63`	`64`	`}`
`64`	`65`	`return PythonOps.GetBoundAttr(context, param, s);`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`
	`69`	`+ [PythonType]`
`68`	`70`	`public sealed class itemgetter : ICodeFormattable {`
`69`	`71`	`private readonly object?[] _items;`
`70`	`72`
`@@ -82,7 +84,7 @@ public itemgetter([NotNone] params object?[] items) {`
`82`	`84`	`public PythonTuple __reduce__() => PythonTuple.MakeTuple(DynamicHelpers.GetPythonType(this), PythonTuple.MakeTuple(_items));`
`83`	`85`
`84`	`86`	`[SpecialName]`
`85`		`- public object Call(CodeContext/!/ context, object param) {`
	`87`	`+ public object? Call(CodeContext/!/ context, object? param) {`
`86`	`88`	`if (_items.Length == 1) {`
`87`	`89`	`return PythonOps.GetIndex(context, param, _items[0]);`
`88`	`90`	`}`