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

2 files changed, 10 insertions, 5 deletions

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 1a9781b..d9633af 100644
--- 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 444656a..6773f2a 100644
--- 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...