Fix more repr

youknowone · youknowone · commit 56403650bea6 · 2025-06-30T09:39:38.000+09:00
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
@@ -1436,8 +1436,6 @@ class G2(Generic[Unpack[Ts]]): pass
             with self.assertRaises(TypeError):
                 C[int, Unpack[Ts], Unpack[Ts]]
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_repr_is_correct(self):
         Ts = TypeVarTuple('Ts')
 
@@ -1555,8 +1553,6 @@ class A(Generic[Unpack[Ts]]): pass
         self.assertEndsWith(repr(K[float]), 'A[float, typing.Unpack[typing.Tuple[str, ...]]]')
         self.assertEndsWith(repr(K[float, str]), 'A[float, str, typing.Unpack[typing.Tuple[str, ...]]]')
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_cannot_subclass(self):
         with self.assertRaisesRegex(TypeError, NOT_A_BASE_TYPE % 'TypeVarTuple'):
             class C(TypeVarTuple): pass
@@ -3634,8 +3630,6 @@ def test_new_repr_complex(self):
             'typing.List[typing.Tuple[typing.List[int], typing.List[int]]]'
         )
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_new_repr_bare(self):
         T = TypeVar('T')
         self.assertEqual(repr(Generic[T]), 'typing.Generic[~T]')
@@ -4300,8 +4294,6 @@ class Y(C[int]):
         self.assertEqual(Y.__qualname__,
                          'GenericTests.test_repr_2.<locals>.Y')
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_repr_3(self):
         T = TypeVar('T')
         T1 = TypeVar('T1')
diff --git a/vm/src/stdlib/typing.rs b/vm/src/stdlib/typing.rs
@@ -559,7 +559,7 @@ pub(crate) mod decl {
         #[inline(always)]
         fn repr_str(zelf: &crate::Py<Self>, vm: &VirtualMachine) -> PyResult<String> {
             let name = zelf.__name__().str(vm)?;
-            Ok(format!("~{}", name))
+            Ok(format!("~{name}"))
         }
     }
 
@@ -747,7 +747,7 @@ pub(crate) mod decl {
         #[inline(always)]
         fn repr_str(zelf: &crate::Py<Self>, vm: &VirtualMachine) -> PyResult<String> {
             let name = zelf.name.str(vm)?;
-            Ok(format!("*{name}"))
+            Ok(name.to_string())
         }
     }
 
@@ -968,7 +968,7 @@ pub(crate) mod decl {
     }
 
     #[pyattr]
-    #[pyclass(name)]
+    #[pyclass(name = "Generic", module = "typing")]
     #[derive(Debug, PyPayload)]
     #[allow(dead_code)]
     pub(crate) struct Generic {}

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ pub(crate) mod decl {`
`559`	`559`	`#[inline(always)]`
`560`	`560`	`fn repr_str(zelf: &crate::Py<Self>, vm: &VirtualMachine) -> PyResult<String> {`
`561`	`561`	`let name = zelf.__name__().str(vm)?;`
`562`		`- Ok(format!("~{}", name))`
	`562`	`+ Ok(format!("~{name}"))`
`563`	`563`	`}`
`564`	`564`	`}`
`565`	`565`
`@@ -747,7 +747,7 @@ pub(crate) mod decl {`
`747`	`747`	`#[inline(always)]`
`748`	`748`	`fn repr_str(zelf: &crate::Py<Self>, vm: &VirtualMachine) -> PyResult<String> {`
`749`	`749`	`let name = zelf.name.str(vm)?;`
`750`		`- Ok(format!("*{name}"))`
	`750`	`+ Ok(name.to_string())`
`751`	`751`	`}`
`752`	`752`	`}`
`753`	`753`
`@@ -968,7 +968,7 @@ pub(crate) mod decl {`
`968`	`968`	`}`
`969`	`969`
`970`	`970`	`#[pyattr]`
`971`		`- #[pyclass(name)]`
	`971`	`+ #[pyclass(name = "Generic", module = "typing")]`
`972`	`972`	`#[derive(Debug, PyPayload)]`
`973`	`973`	`#[allow(dead_code)]`
`974`	`974`	`pub(crate) struct Generic {}`