Issue #1583863: An unicode subclass can now override the __str__ method
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index a859c0f..973a008 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1193,6 +1193,17 @@
self.assertRaises(MemoryError, alloc)
self.assertRaises(MemoryError, alloc)
+ def test_format_subclass(self):
+ class U(unicode):
+ def __str__(self):
+ return '__str__ overridden'
+ def __unicode__(self):
+ return u'__unicode__ overridden'
+ u = U(u'xxx')
+ self.assertEquals("%s" % u, u'__unicode__ overridden')
+ self.assertEquals("{}".format(u), u'__unicode__ overridden')
+
+
def test_main():
test_support.run_unittest(__name__)
diff --git a/Misc/NEWS b/Misc/NEWS
index f93486e..dd61f4f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@
Core and Builtins
-----------------
+- Issue #1583863: An unicode subclass can now override the __str__ method
+
- Issue #6474: Make error message from passing an inadequate number of keyword
arguments to a function correct.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 113a460..82af3a2 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8466,7 +8466,7 @@
case 's':
case 'r':
- if (PyUnicode_Check(v) && c == 's') {
+ if (PyUnicode_CheckExact(v) && c == 's') {
temp = v;
Py_INCREF(temp);
}