Merge pull request #3902 from kimnanhee/main

youknowone · web-flow · commit 2e775814569f · 2022-07-16T16:17:07.000+09:00
Fix byte indices must be integers or slices, error message
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
@@ -989,8 +989,6 @@ 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"
diff --git a/vm/src/builtins/bytes.rs b/vm/src/builtins/bytes.rs
@@ -167,7 +167,7 @@ impl PyBytes {
     }
 
     fn _getitem(&self, needle: &PyObject, vm: &VirtualMachine) -> PyResult {
-        match SequenceIndex::try_from_borrowed_object(vm, needle, "bytes")? {
+        match SequenceIndex::try_from_borrowed_object(vm, needle, "byte")? {
             SequenceIndex::Int(i) => self
                 .inner
                 .elements

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ impl PyBytes {`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`fn _getitem(&self, needle: &PyObject, vm: &VirtualMachine) -> PyResult {`
`170`		`- match SequenceIndex::try_from_borrowed_object(vm, needle, "bytes")? {`
	`170`	`+ match SequenceIndex::try_from_borrowed_object(vm, needle, "byte")? {`
`171`	`171`	`SequenceIndex::Int(i) => self`
`172`	`172`	`.inner`
`173`	`173`	`.elements`