Mercurial > cpython-lru_cache-weakref

diff Objects/unicodeobject.c @ 78794:263d09ce3e9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge 3.2 (#15801)
author Benjamin Peterson <benjamin@python.org>
date Tue, 28 Aug 2012 18:01:45 -0400
parents 2703171ddf53 4d431e719646
children db34753bd70e
line wrap: on
line diff
--- a/Objects/unicodeobject.c	Tue Aug 28 20:10:18 2012 +0200
+++ b/Objects/unicodeobject.c	Tue Aug 28 18:01:45 2012 -0400
@@ -13461,8 +13461,7 @@
         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) {