[Python-checkins] cpython (merge 3.3 -> default): merge 3.3
benjamin.peterson
python-checkins at python.org
Sun Dec 2 18:37:17 CET 2012
http://hg.python.org/cpython/rev/31d6da06a899
changeset: 80698:31d6da06a899
parent: 80695:239486c4e469
parent: 80697:72623edae4df
user: Benjamin Peterson <benjamin at python.org>
date: Sun Dec 02 12:37:09 2012 -0500
summary:
merge 3.3
files:
Lib/test/multibytecodec_support.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Lib/test/multibytecodec_support.py b/Lib/test/multibytecodec_support.py
--- a/Lib/test/multibytecodec_support.py
+++ b/Lib/test/multibytecodec_support.py
@@ -113,7 +113,7 @@
return (ret, exc.end)
codecs.register_error("test.cjktest", myreplace)
- for ret in ([1, 2, 3], [], None, object(), b'string', b''):
+ for ret in ([1, 2, 3], [], None, object()):
self.assertRaises(TypeError, self.encode, self.unmappedunicode,
'test.cjktest')
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list