Fix misused PyTypeError (#6412)

youknowone · web-flow · commit 5a5b7215768c · 2025-12-12T17:23:27.000+09:00
diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs
@@ -5,7 +5,7 @@ mod _csv {
     use crate::common::lock::PyMutex;
     use crate::vm::{
         AsObject, Py, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine,
-        builtins::{PyBaseExceptionRef, PyInt, PyNone, PyStr, PyType, PyTypeError, PyTypeRef},
+        builtins::{PyBaseExceptionRef, PyInt, PyNone, PyStr, PyType, PyTypeRef},
         function::{ArgIterable, ArgumentError, FromArgs, FuncArgs, OptionalArg},
         protocol::{PyIter, PyIterReturn},
         raise_if_stop,
@@ -442,16 +442,16 @@ mod _csv {
         }
     }
     impl TryFrom<isize> for QuoteStyle {
-        type Error = PyTypeError;
-        fn try_from(num: isize) -> Result<Self, PyTypeError> {
+        type Error = ();
+        fn try_from(num: isize) -> Result<Self, Self::Error> {
             match num {
                 0 => Ok(Self::Minimal),
                 1 => Ok(Self::All),
                 2 => Ok(Self::Nonnumeric),
                 3 => Ok(Self::None),
                 4 => Ok(Self::Strings),
                 5 => Ok(Self::Notnull),
-                _ => Err(PyTypeError {}),
+                _ => Err(()),
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ mod _csv {`
`5`	`5`	`use crate::common::lock::PyMutex;`
`6`	`6`	`use crate::vm::{`
`7`	`7`	`AsObject, Py, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine,`
`8`		`- builtins::{PyBaseExceptionRef, PyInt, PyNone, PyStr, PyType, PyTypeError, PyTypeRef},`
	`8`	`+ builtins::{PyBaseExceptionRef, PyInt, PyNone, PyStr, PyType, PyTypeRef},`
`9`	`9`	`function::{ArgIterable, ArgumentError, FromArgs, FuncArgs, OptionalArg},`
`10`	`10`	`protocol::{PyIter, PyIterReturn},`
`11`	`11`	`raise_if_stop,`
`@@ -442,16 +442,16 @@ mod _csv {`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`	`impl TryFrom<isize> for QuoteStyle {`
`445`		`- type Error = PyTypeError;`
`446`		`- fn try_from(num: isize) -> Result<Self, PyTypeError> {`
	`445`	`+ type Error = ();`
	`446`	`+ fn try_from(num: isize) -> Result<Self, Self::Error> {`
`447`	`447`	`match num {`
`448`	`448`	`0 => Ok(Self::Minimal),`
`449`	`449`	`1 => Ok(Self::All),`
`450`	`450`	`2 => Ok(Self::Nonnumeric),`
`451`	`451`	`3 => Ok(Self::None),`
`452`	`452`	`4 => Ok(Self::Strings),`
`453`	`453`	`5 => Ok(Self::Notnull),`
`454`		`- _ => Err(PyTypeError {}),`
	`454`	`+ _ => Err(()),`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`	`}`