Make test_str.py pass.
diff --git a/Lib/test/test_str.py b/Lib/test/test_str.py
index 2936dca..be26b24 100644
--- a/Lib/test/test_str.py
+++ b/Lib/test/test_str.py
@@ -29,9 +29,6 @@
def test_conversion(self):
# Make sure __str__() behaves properly
- class Foo0:
- def __unicode__(self):
- return "foo"
class Foo1:
def __str__(self):
@@ -45,15 +42,15 @@
def __str__(self):
return "foo"
- class Foo4(str):
+ class Foo4(str8):
def __str__(self):
return "foo"
class Foo5(str):
- def __str__(self):
+ def __unicode__(self):
return "foo"
- class Foo6(str):
+ class Foo6(str8):
def __str__(self):
return "foos"
@@ -72,22 +69,23 @@
def __str__(self):
return self
- class Foo9(str):
+ class Foo9(str8):
def __str__(self):
return "string"
def __unicode__(self):
return "not unicode"
- self.assert_(str(Foo0()).startswith("<")) # this is different from __unicode__
self.assertEqual(str(Foo1()), "foo")
self.assertEqual(str(Foo2()), "foo")
self.assertEqual(str(Foo3()), "foo")
self.assertEqual(str(Foo4("bar")), "foo")
self.assertEqual(str(Foo5("bar")), "foo")
- self.assertEqual(str(Foo6("bar")), "foos")
- self.assertEqual(str(Foo7("bar")), "foos")
+ self.assertEqual(str8(Foo6("bar")), "foos")
+ self.assertEqual(str(Foo6("bar")), "foou")
+ self.assertEqual(str8(Foo7("bar")), "foos")
+ self.assertEqual(str(Foo7("bar")), "foou")
self.assertEqual(str(Foo8("foo")), "foofoo")
- self.assertEqual(str(Foo9("foo")), "string")
+ self.assertEqual(str8(Foo9("foo")), "string")
self.assertEqual(str(Foo9("foo")), "not unicode")
def test_main():