diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2015-06-03 17:11:22 (GMT) |
|---|---|---|
| committer | Eric Snow <ericsnowcurrently@gmail.com> | 2015-06-03 17:11:22 (GMT) |
| commit | d8e5d6c4a5c0be047e3b7c53f5954bd3a3a34af6 (patch) | |
| tree | 5220cfd4259e5c1df11934c5bf79acd31cb6d1ef /Objects | |
| parent | cbdb17f681fffba35a805f832f1b5bf99adcc312 (diff) | |
| parent | db4061cb9d3c2a369fa49a3820ffc11854119da3 (diff) | |
| download | cpython-d8e5d6c4a5c0be047e3b7c53f5954bd3a3a34af6.zip cpython-d8e5d6c4a5c0be047e3b7c53f5954bd3a3a34af6.tar.gz cpython-d8e5d6c4a5c0be047e3b7c53f5954bd3a3a34af6.tar.bz2 | |
Merge from 3.5.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/odictobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/odictobject.c b/Objects/odictobject.c index 79ac826..55055ac 100644 --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -1578,7 +1578,7 @@ odict_repr(PyODictObject *self) if (value == NULL) { if (!PyErr_Occurred()) PyErr_SetObject(PyExc_KeyError, key); - return NULL; + goto Done; } pair = PyTuple_Pack(2, key, value); if (pair == NULL) |