Check the type of the exception before ignoring it

BadSingleton · BadSingleton · commit 4ad6e471b8f9 · 2020-12-14T14:10:23.000-05:00
diff --git a/src/runtime/classmanager.cs b/src/runtime/classmanager.cs
@@ -110,10 +110,13 @@ internal static void SaveRuntimeData(RuntimeDataStorage storage)
                     // No need to decref the member, the ClassBase instance does 
                     // not own the reference.
                     Runtime.PyDict_DelItemString(dict, member);
+                    if (Exceptions.ExceptionMatches(Exceptions.KeyError))
+                    {
+                        // Trying to remove a key that's not in the dictionary 
+                        // raises an error. We don't care about it.
+                        Runtime.PyErr_Clear();
+                    }
                 }
-                // Trying to remove a key that's not in the dictionary may 
-                // raise an error. We don't care about it.
-                Runtime.PyErr_Clear();
                 // We modified the Type object, notify it we did.
                 Runtime.PyType_Modified(cls.Value.tpHandle);
             }
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -346,10 +346,13 @@ protected override void OnSave(InterDomainContext context)
             {
                 Runtime.PyDict_DelItemString(dict, pair.Key);
                 pair.Value.DecrRefCount();
+                 if (Exceptions.ExceptionMatches(Exceptions.KeyError))
+                {
+                    // Trying to remove a key that's not in the dictionary 
+                    // raises an error. We don't care about it.
+                    Runtime.PyErr_Clear();
+                }
             }
-            // Trying to remove a key that's not in the dictionary may 
-            // raise an error. We don't care about it.
-            Runtime.PyErr_Clear();
 
             cache.Clear();
         }

Original file line number	Diff line number	Diff line change
`@@ -346,10 +346,13 @@ protected override void OnSave(InterDomainContext context)`
`346`	`346`	`{`
`347`	`347`	`Runtime.PyDict_DelItemString(dict, pair.Key);`
`348`	`348`	`pair.Value.DecrRefCount();`
	`349`	`+ if (Exceptions.ExceptionMatches(Exceptions.KeyError))`
	`350`	`+ {`
	`351`	`+ // Trying to remove a key that's not in the dictionary`
	`352`	`+ // raises an error. We don't care about it.`
	`353`	`+ Runtime.PyErr_Clear();`
	`354`	`+ }`
`349`	`355`	`}`
`350`		`- // Trying to remove a key that's not in the dictionary may`
`351`		`- // raise an error. We don't care about it.`
`352`		`- Runtime.PyErr_Clear();`
`353`	`356`
`354`	`357`	`cache.Clear();`
`355`	`358`	`}`