summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-03-22 12:36:28 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-03-22 12:36:28 (GMT)
commitc7790ed1637ad688ea61decf45703f996f29584d (patch)
tree8184b598978495d1eab2dfdef4e15552af13770a
parent3017a7bbbf2046b93ac89fcbabadaf0a528e5ae1 (diff)
downloadcpython-c7790ed1637ad688ea61decf45703f996f29584d.zip
cpython-c7790ed1637ad688ea61decf45703f996f29584d.tar.gz
cpython-c7790ed1637ad688ea61decf45703f996f29584d.tar.bz2
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.
-rw-r--r--Lib/test/test_unicode.py2
-rw-r--r--Misc/NEWS2
2 files changed, 1 insertions, 3 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 973a008..368788f 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1195,8 +1195,6 @@ class UnicodeTest(
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')
diff --git a/Misc/NEWS b/Misc/NEWS
index 12db4af..385e341 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,7 +12,7 @@ What's New in Python 2.7 beta 1?
Core and Builtins
-----------------
-- Issue #1583863: An unicode subclass can now override the __str__ method
+- Issue #1583863: An unicode subclass can now override the __unicode__ method
- Issue #6474: Make error message from passing an inadequate number of keyword
arguments to a function correct.