Changed to use 'U' argument to PyArg_ParseTuple, instead of manually checking for...

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 1a9781b7d79aca176035e51b6878c1ecc3ee4286..d9633af473831e14f656722042fba885ed8397cf 100644 (file)
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -525,10 +525,15 @@ class BuiltinTest(unittest.TestCase):
                 return str(self.x) + format_spec
 
         # class that returns a bad type from __format__
-        class H:
+        class B:
             def __format__(self, format_spec):
                 return 1.0
 
+        # class that is derived from string, used
+        #  as a format spec
+        class C(str):
+            pass
+
         self.assertEqual(format(3, ''), '3')
         self.assertEqual(format(A(3), 'spec'), '3spec')
 
@@ -550,7 +555,10 @@ class BuiltinTest(unittest.TestCase):
         empty_format_spec(None)
 
         # TypeError because self.__format__ returns the wrong type
-        self.assertRaises(TypeError, format, H(), "")
+        self.assertRaises(TypeError, format, B(), "")
+
+        # make sure we can take a subclass of str as a format spec
+        self.assertEqual(format(0, C('10')), '         0')
 
     def test_getattr(self):
         import sys

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 444656a1ba38de63b03d5ad26edd6ed32c823e55..6773f2ab09e74acdd06c837bc3e3392047712be4 100644 (file)
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -581,9 +581,6 @@ class UnicodeTest(
         self.assertRaises(ValueError, format, "", "-")
         self.assertRaises(ValueError, "{0:=s}".format, '')
 
-        # check that __format__ returns a string
-        #self.assertRaises(TypeError, "{0}".format, H())
-
     def test_formatting(self):
         string_tests.MixinStrUnicodeUserStringTest.test_formatting(self)
         # Testing Unicode formatting strings...

diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h
index 8e2b8ef0957e851038d7c8ae9527863e39bcc46d..ee0971ddbbb84ffb8d2fd3c112cebecacf479f35 100644 (file)
--- a/Objects/stringlib/formatter.h
+++ b/Objects/stringlib/formatter.h
@@ -768,12 +768,8 @@ FORMAT_STRING(PyObject* value, PyObject* args)
     PyObject *result = NULL;
     InternalFormatSpec format;
 
-    if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
+    if (!PyArg_ParseTuple(args, STRINGLIB_PARSE_CODE ":__format__", &format_spec))
         goto done;
-    if (!STRINGLIB_CHECK(format_spec)) {
-        PyErr_SetString(PyExc_TypeError, STRINGLIB_TYPE_NAME " object required");
-        goto done;
-    }
 
     /* check for the special case of zero length format spec, make
        it equivalent to str(value) */
@@ -843,12 +839,8 @@ FORMAT_LONG(PyObject* value, PyObject* args)
     PyObject *tmp = NULL;
     InternalFormatSpec format;
 
-    if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
-        goto done;
-    if (!STRINGLIB_CHECK(format_spec)) {
-        PyErr_SetString(PyExc_TypeError, STRINGLIB_TYPE_NAME " object required");
+    if (!PyArg_ParseTuple(args, STRINGLIB_PARSE_CODE ":__format__", &format_spec))
         goto done;
-    }
 
     /* check for the special case of zero length format spec, make
        it equivalent to str(value) */
@@ -917,12 +909,8 @@ FORMAT_FLOAT(PyObject *value, PyObject *args)
     PyObject *tmp = NULL;
     InternalFormatSpec format;
 
-    if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
-        goto done;
-    if (!STRINGLIB_CHECK(format_spec)) {
-        PyErr_SetString(PyExc_TypeError, STRINGLIB_TYPE_NAME " object required");
+    if (!PyArg_ParseTuple(args, STRINGLIB_PARSE_CODE ":__format__", &format_spec))
         goto done;
-    }
 
     /* check for the special case of zero length format spec, make
        it equivalent to str(value) */

diff --git a/Objects/stringlib/stringdefs.h b/Objects/stringlib/stringdefs.h
index af9bbd6fd3244fe3d556eee64ab991cb4c32c6d2..a4be17fa90c218d3c82d30c15351a67c7217f0e9 100644 (file)
--- a/Objects/stringlib/stringdefs.h
+++ b/Objects/stringlib/stringdefs.h
@@ -8,6 +8,7 @@
 
 #define STRINGLIB_CHAR           char
 #define STRINGLIB_TYPE_NAME      "string"
+#define STRINGLIB_PARSE_CODE     "S"
 #define STRINGLIB_EMPTY          string_empty
 #define STRINGLIB_ISDECIMAL(x)   ((x >= '0') && (x <= '9'))
 #define STRINGLIB_TODECIMAL(x)   (STRINGLIB_ISDECIMAL(x) ? (x - '0') : -1)

diff --git a/Objects/stringlib/unicodedefs.h b/Objects/stringlib/unicodedefs.h
index a50a3f283f37a92cb7ff87900d2d2e186ef43b67..25c1d4fca441a6a83b7f87f981a7eedb0d8a4881 100644 (file)
--- a/Objects/stringlib/unicodedefs.h
+++ b/Objects/stringlib/unicodedefs.h
@@ -8,6 +8,7 @@
 
 #define STRINGLIB_CHAR           Py_UNICODE
 #define STRINGLIB_TYPE_NAME      "unicode"
+#define STRINGLIB_PARSE_CODE     "U"
 #define STRINGLIB_EMPTY          unicode_empty
 #define STRINGLIB_ISDECIMAL      Py_UNICODE_ISDECIMAL
 #define STRINGLIB_TODECIMAL      Py_UNICODE_TODECIMAL

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index c4fc57df697657b34174f258abc310aa34e93b40..6675abfba2b794bcdeef90344f37db810147d73c 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -293,7 +293,7 @@ builtin_format(PyObject *self, PyObject *args)
                         goto done;
         }
 
-        if (!PyArg_ParseTuple(args, "O|O:format", &value, &spec))
+        if (!PyArg_ParseTuple(args, "O|U:format", &value, &spec))
                goto done;
 
         /* initialize the default value */