Mercurial > cpython-lru_cache-weakref

diff Objects/unicodeobject.c @ 43577:ace45b361e87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Patch# 1258 by Christian Heimes: kill basestring. I like this because it makes the code shorter! :-)
author Guido van Rossum <guido@python.org>
date Tue, 16 Oct 2007 18:12:55 +0000
parents e72ad4d256e8
children b10544827af7
line wrap: on
line diff
--- a/Objects/unicodeobject.c	Tue Oct 16 06:31:30 2007 +0000
+++ b/Objects/unicodeobject.c	Tue Oct 16 18:12:55 2007 +0000
@@ -8441,7 +8441,7 @@
 	argidx = -2;
     }
     if (Py_Type(args)->tp_as_mapping && !PyTuple_Check(args) &&
-        !PyObject_TypeCheck(args, &PyBaseString_Type))
+        !PyString_Check(args) && !PyUnicode_Check(args))
 	dict = args;
 
     while (--fmtcnt >= 0) {
@@ -8935,7 +8935,7 @@
     unicode_methods,			/* tp_methods */
     0,					/* tp_members */
     0,					/* tp_getset */
-    &PyBaseString_Type,			/* tp_base */
+    &PyBaseObject_Type,			/* tp_base */
     0,					/* tp_dict */
     0,					/* tp_descr_get */
     0,					/* tp_descr_set */