apply review

youknowone · youknowone · commit 4f51bd5f3443 · 2025-08-26T15:18:00.000+09:00
diff --git a/Lib/test/test_patma.py b/Lib/test/test_patma.py
@@ -3206,7 +3206,6 @@ def test_wildcard_makes_remaining_patterns_unreachable_5(self):
                 pass
         """)
 
-    @unittest.expectedFailure   # TODO: RUSTPYTHON
     def test_mapping_pattern_duplicate_key(self):
         self.assert_syntax_error("""
         match ...:
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -3583,11 +3583,16 @@ impl Compiler {
             let mut seen = std::collections::HashSet::new();
             for key in keys {
                 let is_attribute = matches!(key, Expr::Attribute(_));
-                let key_repr = if let Expr::NumberLiteral(_)
-                | Expr::StringLiteral(_)
-                | Expr::BooleanLiteral(_) = key
-                {
-                    format!("{:?}", key)
+                let is_literal = matches!(
+                    key,
+                    Expr::NumberLiteral(_)
+                        | Expr::StringLiteral(_)
+                        | Expr::BytesLiteral(_)
+                        | Expr::BooleanLiteral(_)
+                        | Expr::NoneLiteral(_)
+                );
+                let key_repr = if is_literal {
+                    unparse_expr(key, &self.source_file).to_string()
                 } else if is_attribute {
                     String::new()
                 } else {
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -1341,10 +1341,11 @@ impl ExecutingFrame<'_> {
                     for key in keys {
                         match subject.get_item(key.as_object(), vm) {
                             Ok(value) => values.push(value),
-                            Err(_) => {
+                            Err(e) if e.fast_isinstance(vm.ctx.exceptions.key_error) => {
                                 all_match = false;
                                 break;
                             }
+                            Err(e) => return Err(e),
                         }
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -1341,10 +1341,11 @@ impl ExecutingFrame<'_> {`
`1341`	`1341`	`for key in keys {`
`1342`	`1342`	`match subject.get_item(key.as_object(), vm) {`
`1343`	`1343`	`Ok(value) => values.push(value),`
`1344`		`- Err(_) => {`
	`1344`	`+ Err(e) if e.fast_isinstance(vm.ctx.exceptions.key_error) => {`
`1345`	`1345`	`all_match = false;`
`1346`	`1346`	`break;`
`1347`	`1347`	`}`
	`1348`	`+ Err(e) => return Err(e),`
`1348`	`1349`	`}`
`1349`	`1350`	`}`
`1350`	`1351`