[pypy-commit] pypy stdlib-2.7.8: adapt to 2.7 from 3.3

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: stdlib-2.7.8
Changeset: r72988:8fd30229b5fe
Date: 2014-08-22 17:34 -0700
http://bitbucket.org/pypy/pypy/changeset/8fd30229b5fe/

Log:	adapt to 2.7 from 3.3

diff --git a/pypy/module/_csv/test/test_dialect.py b/pypy/module/_csv/test/test_dialect.py
--- a/pypy/module/_csv/test/test_dialect.py
+++ b/pypy/module/_csv/test/test_dialect.py
@@ -89,8 +89,8 @@
         exc_info = raises(TypeError, _csv.register_dialect, 'foo1', delimiter="")
         assert exc_info.value.args[0] == '"delimiter" must be a 1-character string'
 
-        exc_info = raises(TypeError, _csv.register_dialect, 'foo1', delimiter=b",")
-        assert exc_info.value.args[0] == '"delimiter" must be string, not bytes'
+        exc_info = raises(TypeError, _csv.register_dialect, 'foo1', delimiter=u",")
+        assert exc_info.value.args[0] == '"delimiter" must be string, not unicode'
 
         exc_info = raises(TypeError, _csv.register_dialect, 'foo1', delimiter=4)
         assert exc_info.value.args[0] == '"delimiter" must be string, not int'