mirror of
https://github.com/python/cpython.git
synced 2025-07-19 01:05:26 +00:00
Merged revisions 73715 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line convert old fail* assertions to assert* ........
This commit is contained in:
parent
ef82be368a
commit
ab91fdef1f
274 changed files with 4538 additions and 4538 deletions
|
@ -315,7 +315,7 @@ class TestDialectRegistry(unittest.TestCase):
|
|||
expected_dialects.sort()
|
||||
csv.register_dialect(name, myexceltsv)
|
||||
try:
|
||||
self.failUnless(csv.get_dialect(name).delimiter, '\t')
|
||||
self.assertTrue(csv.get_dialect(name).delimiter, '\t')
|
||||
got_dialects = csv.list_dialects()
|
||||
got_dialects.sort()
|
||||
self.assertEqual(expected_dialects, got_dialects)
|
||||
|
@ -326,8 +326,8 @@ class TestDialectRegistry(unittest.TestCase):
|
|||
name = 'fedcba'
|
||||
csv.register_dialect(name, delimiter=';')
|
||||
try:
|
||||
self.failUnless(csv.get_dialect(name).delimiter, '\t')
|
||||
self.failUnless(list(csv.reader('X;Y;Z', name)), ['X', 'Y', 'Z'])
|
||||
self.assertTrue(csv.get_dialect(name).delimiter, '\t')
|
||||
self.assertTrue(list(csv.reader('X;Y;Z', name)), ['X', 'Y', 'Z'])
|
||||
finally:
|
||||
csv.unregister_dialect(name)
|
||||
|
||||
|
@ -811,7 +811,7 @@ Stonecutters Seafood and Chop House, Lemont, IL, 12/19/02, Week Back
|
|||
# given that all three lines in sample3 are equal,
|
||||
# I think that any character could have been 'guessed' as the
|
||||
# delimiter, depending on dictionary order
|
||||
self.assert_(dialect.delimiter in self.sample3)
|
||||
self.assertTrue(dialect.delimiter in self.sample3)
|
||||
dialect = sniffer.sniff(self.sample3, delimiters="?,")
|
||||
self.assertEqual(dialect.delimiter, "?")
|
||||
dialect = sniffer.sniff(self.sample3, delimiters="/,")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue