mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
No longer attempt to instantiate python classes describing dialects. This
was done because we were previously performing validation of the dialect from python, but this is now down within the C module. Also, the method we were using to detect classes did not work with new-style classes.
This commit is contained in:
parent
86625972a1
commit
8c94b42f31
2 changed files with 6 additions and 55 deletions
|
@ -24,25 +24,12 @@ class Test_Csv(unittest.TestCase):
|
|||
self.assertRaises(TypeError, ctor, arg, delimiter = 0)
|
||||
self.assertRaises(TypeError, ctor, arg, delimiter = 'XX')
|
||||
self.assertRaises(csv.Error, ctor, arg, 'foo')
|
||||
self.assertRaises(TypeError, ctor, arg, None)
|
||||
self.assertRaises(TypeError, ctor, arg, delimiter=None)
|
||||
self.assertRaises(TypeError, ctor, arg, delimiter=1)
|
||||
self.assertRaises(TypeError, ctor, arg, quotechar=1)
|
||||
self.assertRaises(TypeError, ctor, arg, lineterminator=None)
|
||||
self.assertRaises(TypeError, ctor, arg, lineterminator=1)
|
||||
self.assertRaises(TypeError, ctor, arg, quoting=None)
|
||||
# We now allow this, only raising an exception if quoting is needed.
|
||||
# self.assertRaises(TypeError, ctor, arg, quotechar=None)
|
||||
# self.assertRaises(TypeError, ctor, arg,
|
||||
# quoting=csv.QUOTE_NONE, escapechar=None)
|
||||
# No longer complains about dialects with invalid attributes [AM]
|
||||
# class BadDialect:
|
||||
# bad_attr = 0
|
||||
# self.assertRaises(AttributeError, csv.reader, [], BadDialect)
|
||||
class BadClass:
|
||||
def __init__(self):
|
||||
raise IOError
|
||||
self.assertRaises(IOError, csv.reader, [], BadClass)
|
||||
|
||||
def test_reader_arg_valid(self):
|
||||
self._test_arg_valid(csv.reader, [])
|
||||
|
@ -258,11 +245,6 @@ class TestDialectRegistry(unittest.TestCase):
|
|||
self.assertRaises(csv.Error, csv.unregister_dialect, "nonesuch")
|
||||
self.assertRaises(TypeError, csv.register_dialect, None)
|
||||
self.assertRaises(TypeError, csv.register_dialect, None, None)
|
||||
self.assertRaises(TypeError, csv.register_dialect, "nonesuch", None)
|
||||
class bogus:
|
||||
def __init__(self):
|
||||
raise KeyError
|
||||
self.assertRaises(KeyError, csv.register_dialect, "nonesuch", bogus)
|
||||
|
||||
def test_registry(self):
|
||||
class myexceltsv(csv.excel):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue