commit fc6e8fe5edbeb502d6eb699c7c7aa3f00396667f
author Eric Smith <eric@trueblade.com> Fri Jan 11 00:17:22 2008 +0000
committer Eric Smith <eric@trueblade.com> Fri Jan 11 00:17:22 2008 +0000
tree 3ca38a6cbb73413fa25e3a17059e3367d38f6851
parent 0041223f51ffc267417dbd697716add494735b3a

Simplifed argument parsing in object.__format__, added test case.

Objects/typeobject.c

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 2a0dd24..682c029 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2950,12 +2950,8 @@
         PyObject *result = NULL;
         PyObject *format_meth = NULL;
 
-        if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
+        if (!PyArg_ParseTuple(args, "U:__format__", &format_spec))
                 return NULL;
-        if (!PyUnicode_Check(format_spec)) {
-                PyErr_SetString(PyExc_TypeError, "Unicode object required");
-                return NULL;
-        }
 
         self_as_str = PyObject_Str(self);
         if (self_as_str != NULL) {