Jan 7, 2021 · Nov 9, 2020 · Nov 9, 2020 · Nov 18, 2020 · Nov 18, 2020 · Nov 19, 2020
diff --git a/src/runtime/classmanager.cs b/src/runtime/classmanager.cs
                    // 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
            {
                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
Expand Up		@@ -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);
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -346,10 +346,13 @@ protected override void OnSave(InterDomainContext context)
		{
		Runtime.PyDict_DelItemString(dict, pair.Key);
		pair.Value.DecrRefCount();
		if (Exceptions.ExceptionMatches(Exceptions.KeyError))
Copy link Contributor benoithudsonDec 10, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. weird indent Copy link Contributor benoithudsonDec 10, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. also do you need to PyErr_Clear() before starting the loop? Could someone have set the error for unrelated reasons before entering here? Copy link ContributorAuthor BadSingletonDec 10, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I think it's a non-problem. Either: Someone an exception other than KeyError and we never set one and we don't clear or clobber it we clobber it by setting a KeyError Someone set a KeyError before us and we clear in the loop (instead of clearing before the loop). Copy link Member lostmsuDec 10, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. You should only make the check when`PyDict_DelItemString` actually returns`-1`
		{
		// Trying to remove a key that's not in the dictionary
		// raises an error. We don't care about it.
lostmsu marked this conversation as resolved. Show resolvedHide resolved
		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();
		}
Expand Down