Author: Manuel Jacob
Branch: py3k
Changeset: r61204:c9147dcf3e21
Date: 2013-02-13 12:13 +0100
http://bitbucket.org/pypy/pypy/changeset/c9147dcf3e21/
Log: Port some changes in test_csv.py from 2.7 to 3.2.
diff --git a/lib-python/3.2/test/test_csv.py b/lib-python/3.2/test/test_csv.py
--- a/lib-python/3.2/test/test_csv.py
+++ b/lib-python/3.2/test/test_csv.py
@@ -19,7 +19,8 @@
"""
def _test_arg_valid(self, ctor, arg):
self.assertRaises(TypeError, ctor)
- self.assertRaises(TypeError, ctor, None)
+ # PyPy gets an AttributeError instead of a TypeError
+ self.assertRaises((TypeError, AttributeError), ctor, None)
self.assertRaises(TypeError, ctor, arg, bad_attr = 0)
self.assertRaises(TypeError, ctor, arg, delimiter = 0)
self.assertRaises(TypeError, ctor, arg, delimiter = 'XX')
@@ -125,7 +126,8 @@
expect + writer.dialect.lineterminator)
def test_write_arg_valid(self):
- self.assertRaises(csv.Error, self._write_test, None, '')
+ # PyPy gets a TypeError instead of a csv.Error for "not a sequence"
+ self.assertRaises((csv.Error, TypeError), self._write_test, None, '')
self._write_test((), '')
self._write_test([None], '""')
self.assertRaises(csv.Error, self._write_test,
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
