mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-15 23:35:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.2 (#15801)

Browse source
This commit is contained in:
Benjamin Peterson 2012-08-28 18:01:45 -04:00
commit 59043f96ea
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Objects/unicodeobject.c
View file

@ -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) {