RustPython · youknowone · Mar 12, 2022 · Oct 15, 2021 · Oct 16, 2021 · Oct 16, 2021
diff --git a/Lib/test/list_tests.py b/Lib/test/list_tests.py
@@ -32,12 +32,16 @@ def test_init(self):
         self.assertNotEqual(id(a), id(b))
         self.assertEqual(a, b)
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_getitem_error(self):
         a = []
         msg = "list indices must be integers or slices"
         with self.assertRaisesRegex(TypeError, msg):
             a['a']
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_setitem_error(self):
         a = []
         msg = "list indices must be integers or slices"
@@ -102,6 +106,8 @@ def test_reversed(self):
         # Bug 3689: make sure list-reversed-iterator doesn't have __len__
         self.assertRaises(TypeError, len, reversed([1,2,3]))
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_setitem(self):
         a = self.type2test([0, 1])
         a[0] = 0

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
@@ -989,6 +989,8 @@ def test_sq_item(self):
 class BytesTest(BaseBytesTest, unittest.TestCase):
     type2test = bytes
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_getitem_error(self):
         b = b'python'
         msg = "byte indices must be integers or slices"
@@ -1181,12 +1183,16 @@ class BufferBlocked(bytearray):
 class ByteArrayTest(BaseBytesTest, unittest.TestCase):
     type2test = bytearray
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_getitem_error(self):
         b = bytearray(b'python')
         msg = "bytearray indices must be integers or slices"
         with self.assertRaisesRegex(TypeError, msg):
             b['a']
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_setitem_error(self):
         b = bytearray(b'python')
         msg = "bytearray indices must be integers or slices"

diff --git a/Lib/test/test_tuple.py b/Lib/test/test_tuple.py
@@ -18,6 +18,8 @@
 class TupleTest(seq_tests.CommonTest):
     type2test = tuple
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_getitem_error(self):
         t = ()
         msg = "tuple indices must be integers or slices"

diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
@@ -2500,7 +2500,6 @@ def __del__(self):
         elem = b.close()
         self.assertEqual(elem[0].tail, 'ABCDEFGHIJKL')
 
-    @unittest.skip("TODO: RUSTPYTHON, hangs")
     def test_subscr(self):
         # Issue #27863
         class X:

diff --git a/derive/src/pyclass.rs b/derive/src/pyclass.rs
@@ -636,7 +636,7 @@ impl GetSetNursery {
         for ((name, _cfgs), (getter, setter, deleter)) in self.map.iter() {
             if getter.is_none() {
                 errors.push(syn::Error::new_spanned(
-                    setter.as_ref().or_else(|| deleter.as_ref()).unwrap(),
+                    setter.as_ref().or(deleter.as_ref()).unwrap(),
                     format!("Property '{}' is missing a getter", name),
                 ));
             };