commit | 8a1a5945908c7a0b2b487a98431ff46ab934014a | [log] [tgz] |
---|---|---|
author | Jim Fulton <jim@zope.com> | Sun Feb 08 04:21:26 2004 +0000 |
committer | Jim Fulton <jim@zope.com> | Sun Feb 08 04:21:26 2004 +0000 |
tree | d366a15b19d7e6c171081c025b1f49fff62a964d | |
parent | ee33b27ef0bd49227aa59f0d3bca67e7f1e0ab64 [diff] [blame] |
Fixed a bug in object.__reduce_ex__ (reduce_2) when using protocol 2. Failure to clear the error when attempts to get the __getstate__ attribute fail caused intermittent errors and odd behavior.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 6403103..f26ddd6 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c
@@ -2581,6 +2581,7 @@ goto end; } else { + PyErr_Clear(); state = PyObject_GetAttrString(obj, "__dict__"); if (state == NULL) { PyErr_Clear();