diff options
| author | Raymond Hettinger <python@rcn.com> | 2008-01-25 19:24:46 +0000 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2008-01-25 19:24:46 +0000 |
| commit | 3dbd4c536d685fff0ced7c0aa93d7da2949e8ea0 (patch) | |
| tree | b16ccd3cebd37ecfbb250b552de34789b32a7730 /Objects/dictobject.c | |
| parent | 8608d91e07868f14f71be9784149f813ef1b0a74 (diff) | |
| download | cpython-git-3dbd4c536d685fff0ced7c0aa93d7da2949e8ea0.tar.gz | |
Changes 54857 and 54840 broke code and were reverted in Py2.5 just before
it was released, but that reversion never made it to the Py2.6 head.
Diffstat (limited to 'Objects/dictobject.c')
| -rw-r--r-- | Objects/dictobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 1035e5fd5d..3b7c128716 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1406,7 +1406,7 @@ PyDict_Merge(PyObject *a, PyObject *b, int override) return -1; } mp = (PyDictObject*)a; - if (PyDict_CheckExact(b)) { + if (PyDict_Check(b)) { other = (PyDictObject*)b; if (other == mp || other->ma_used == 0) /* a.update(a) or a.update({}); nothing to do */ |