summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-03-22 12:56:39 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-03-22 12:56:39 (GMT)
commit4fd2ff90a4d45b042549ff5919b41ffce3c245e8 (patch)
treefd7d6ef0a711c2eae90df3871c8f50d7526be5b8 /Lib
parent974dd583720cee19f3f722002720a0f2cd704577 (diff)
downloadcpython-4fd2ff90a4d45b042549ff5919b41ffce3c245e8.zip
cpython-4fd2ff90a4d45b042549ff5919b41ffce3c245e8.tar.gz
cpython-4fd2ff90a4d45b042549ff5919b41ffce3c245e8.tar.bz2
Merged revisions 79278,79280 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r79278 | victor.stinner | 2010-03-22 13:24:37 +0100 (lun., 22 mars 2010) | 2 lines Issue #1583863: An unicode subclass can now override the __str__ method ........ r79280 | victor.stinner | 2010-03-22 13:36:28 +0100 (lun., 22 mars 2010) | 5 lines Fix the NEWS about my last commit: an unicode subclass can now override the __unicode__ method (and not the __str__ method). Simplify also the testcase. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_unicode.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 4b2d055..6f6e96f 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1142,6 +1142,15 @@ class UnicodeTest(
self.assertRaises(MemoryError, alloc)
self.assertRaises(MemoryError, alloc)
+ def test_format_subclass(self):
+ class U(unicode):
+ def __unicode__(self):
+ return u'__unicode__ overridden'
+ u = U(u'xxx')
+ self.assertEquals("%s" % u, u'__unicode__ overridden')
+ self.assertEquals("{0}".format(u), u'__unicode__ overridden')
+
+
def test_main():
test_support.run_unittest(__name__)