diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-08-28 22:01:45 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-08-28 22:01:45 (GMT) |
| commit | 59043f96eaf5797c0a1f9058b802fcfea5d044fa (patch) | |
| tree | 170cf6031e722c2a8a0601aa33a12e7c43753b9c /Objects | |
| parent | 5b9eccb383c21fda80f3e3b5b9d6bb803b7b70bf (diff) | |
| parent | 28a6cfaefc41a4e4bfa6dd0b54318c0465987652 (diff) | |
| download | cpython-59043f96eaf5797c0a1f9058b802fcfea5d044fa.zip cpython-59043f96eaf5797c0a1f9058b802fcfea5d044fa.tar.gz cpython-59043f96eaf5797c0a1f9058b802fcfea5d044fa.tar.bz2 | |
merge 3.2 (#15801)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/unicodeobject.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 773a9be..af4a13a 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -13461,8 +13461,7 @@ PyUnicode_Format(PyObject *format, PyObject *args) arglen = -1; argidx = -2; } - if (Py_TYPE(args)->tp_as_mapping && !PyTuple_Check(args) && - !PyUnicode_Check(args)) + if (PyMapping_Check(args) && !PyTuple_Check(args) && !PyUnicode_Check(args)) dict = args; while (--fmtcnt >= 0) { |