From 28a6cfaefc41a4e4bfa6dd0b54318c0465987652 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 28 Aug 2012 17:55:35 -0400
Subject: use the stricter PyMapping_Check (closes #15801)

---
 Objects/unicodeobject.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Objects/unicodeobject.c')

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index b25b17b6a0..8b782b4065 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9504,8 +9504,7 @@ PyObject *PyUnicode_Format(PyObject *format,
         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) {
-- 
cgit v1.2.1