stop panic on to_string, report using write_unraisable instead

PyO3 · May 9, 2023 · 5aff2cc · 5aff2cc
1 parent c27a633
commit 5aff2cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/newsfragments/3062.fixed.md b/newsfragments/3062.fixed.md
@@ -0,0 +1 @@
+Stop panic on `fmt::Display`, instead return `"<unprintable object>"` string and report error via `sys.unraisablehook()`
diff --git a/src/types/mod.rs b/src/types/mod.rs
@@ -99,8 +99,15 @@ macro_rules! pyobject_native_type_base(
             fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>)
                    -> ::std::result::Result<(), ::std::fmt::Error>
             {
-                let s = self.str().or(::std::result::Result::Err(::std::fmt::Error))?;
-                f.write_str(&s.to_string_lossy())
+                match self.str() {
+                    ::std::result::Result::Ok(s) => return f.write_str(&s.to_string_lossy()),
+                    ::std::result::Result::Err(err) => err.write_unraisable(self.py(), ::std::option::Option::Some(self)),
+                }
+
+                match self.get_type().name() {
+                    ::std::result::Result::Ok(name) => ::std::write!(f, "<unprintable {} object>", name),
+                    ::std::result::Result::Err(_err) => f.write_str("<unprintable object>"),
+                }
             }
         }