fix: workaround for #2682 and #2422 by simply clearing the TypeError (#2685)

8adef2c7 · Boris Staletic · GitHub · 087b07c8 · 8adef2c7
Unverified Commit 8adef2c7 authored Nov 23, 2020 by Boris Staletic Committed by GitHub Nov 23, 2020
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

include/pybind11/cast.h include/pybind11/cast.h +8 -1

No files found.
--- a/include/pybind11/cast.h
+++ b/include/pybind11/cast.h
@@ -1870,7 +1870,14 @@ private:
 #if !defined(NDEBUG)
        , type(type_id<T>())
 #endif
-    { }
+    {
+        // Workaround! See:
+        // https://github.com/pybind/pybind11/issues/2336
+        // https://github.com/pybind/pybind11/pull/2685#issuecomment-731286700
+        if (PyErr_Occurred()) {
+            PyErr_Clear();
+        }
+    }

 public:
    /// Direct construction with name, default, and description