diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-24 21:02:05 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-24 21:02:05 (GMT) |
commit | fcdf9f215e9f304e362b47da7417e6117db7f5ed (patch) | |
tree | e6f2bcad984fca69414db249da87f76c585111ca /Lib/test/string_tests.py | |
parent | 95a3633c9612cefb137f8f3bcf305b9d8a923688 (diff) | |
download | cpython-fcdf9f215e9f304e362b47da7417e6117db7f5ed.zip cpython-fcdf9f215e9f304e362b47da7417e6117db7f5ed.tar.gz cpython-fcdf9f215e9f304e362b47da7417e6117db7f5ed.tar.bz2 |
Merged revisions 77731 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77731 | ezio.melotti | 2010-01-24 22:59:24 +0200 (Sun, 24 Jan 2010) | 9 lines
Merged revisions 77729 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77729 | ezio.melotti | 2010-01-24 22:48:35 +0200 (Sun, 24 Jan 2010) | 1 line
remove archaic functions from test_support
........
................
Diffstat (limited to 'Lib/test/string_tests.py')
-rw-r--r-- | Lib/test/string_tests.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index 1637efb..5f5b291 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -962,15 +962,15 @@ class MixinStrUnicodeUserStringTest: self.checkraises(TypeError, 'hello', 'endswith', (42,)) def test___contains__(self): - self.checkequal(True, '', '__contains__', '') # vereq('' in '', True) - self.checkequal(True, 'abc', '__contains__', '') # vereq('' in 'abc', True) - self.checkequal(False, 'abc', '__contains__', '\0') # vereq('\0' in 'abc', False) - self.checkequal(True, '\0abc', '__contains__', '\0') # vereq('\0' in '\0abc', True) - self.checkequal(True, 'abc\0', '__contains__', '\0') # vereq('\0' in 'abc\0', True) - self.checkequal(True, '\0abc', '__contains__', 'a') # vereq('a' in '\0abc', True) - self.checkequal(True, 'asdf', '__contains__', 'asdf') # vereq('asdf' in 'asdf', True) - self.checkequal(False, 'asd', '__contains__', 'asdf') # vereq('asdf' in 'asd', False) - self.checkequal(False, '', '__contains__', 'asdf') # vereq('asdf' in '', False) + self.checkequal(True, '', '__contains__', '') + self.checkequal(True, 'abc', '__contains__', '') + self.checkequal(False, 'abc', '__contains__', '\0') + self.checkequal(True, '\0abc', '__contains__', '\0') + self.checkequal(True, 'abc\0', '__contains__', '\0') + self.checkequal(True, '\0abc', '__contains__', 'a') + self.checkequal(True, 'asdf', '__contains__', 'asdf') + self.checkequal(False, 'asd', '__contains__', 'asdf') + self.checkequal(False, '', '__contains__', 'asdf') def test_subscript(self): self.checkequal('a', 'abc', '__getitem__', 0) |