diff options
author | Martin Panter <vadmium+py@gmail.com> | 2016-04-10 08:48:51 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2016-04-10 08:48:51 (GMT) |
commit | 731b1b12b8de92b5da8bcdb5ba686f1d3a83662a (patch) | |
tree | 8781b45994c2998bd3ca6bc1766e1fccaa96a66b /Lib | |
parent | 0d0db6cc1e3ef5c32f6bc9f4e47be2428c43423f (diff) | |
download | cpython-731b1b12b8de92b5da8bcdb5ba686f1d3a83662a.zip cpython-731b1b12b8de92b5da8bcdb5ba686f1d3a83662a.tar.gz cpython-731b1b12b8de92b5da8bcdb5ba686f1d3a83662a.tar.bz2 |
Remove relics of str8 (became bytes) and buffer (bytearray) type tests
Remove redundant tests now that str is unicode.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/string_tests.py | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index 7d30e9e..cd3ee48 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -645,14 +645,6 @@ class BaseTest: EQ("bobobXbobob", "bobobobXbobobob", "replace", "bobob", "bob") EQ("BOBOBOB", "BOBOBOB", "replace", "bob", "bobby") - # XXX Commented out. Is there any reason to support buffer objects - # as arguments for str.replace()? GvR -## ba = bytearray('a') -## bb = bytearray('b') -## EQ("bbc", "abc", "replace", ba, bb) -## EQ("aac", "abc", "replace", bb, ba) - - # self.checkequal('one@two!three!', 'one!two!three!', 'replace', '!', '@', 1) self.checkequal('onetwothree', 'one!two!three!', 'replace', '!', '') self.checkequal('one@two@three!', 'one!two!three!', 'replace', '!', '@', 2) @@ -1389,28 +1381,3 @@ class MixinStrUnicodeTest: s1 = t("abcd") s2 = t().join([s1]) self.assertIs(s1, s2) - - # Should also test mixed-type join. - if t is str: - s1 = subclass("abcd") - s2 = "".join([s1]) - self.assertIsNot(s1, s2) - self.assertIs(type(s2), t) - - s1 = t("abcd") - s2 = "".join([s1]) - self.assertIs(s1, s2) - -## elif t is str8: -## s1 = subclass("abcd") -## s2 = "".join([s1]) -## self.assertIsNot(s1, s2) -## self.assertIs(type(s2), str) # promotes! - -## s1 = t("abcd") -## s2 = "".join([s1]) -## self.assertIsNot(s1, s2) -## self.assertIs(type(s2), str) # promotes! - - else: - self.fail("unexpected type for MixinStrUnicodeTest %r" % t) |