[pypy-commit] pypy py3.5: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r95092:cbe861385419
Date: 2018-09-11 15:38 +0200
http://bitbucket.org/pypy/pypy/changeset/cbe861385419/

Log:	hg merge default

diff --git a/pypy/objspace/std/test/test_unicodeobject.py b/pypy/objspace/std/test/test_unicodeobject.py
--- a/pypy/objspace/std/test/test_unicodeobject.py
+++ b/pypy/objspace/std/test/test_unicodeobject.py
@@ -1105,7 +1105,12 @@
         assert type(str(z)) is str
         assert str(z) == u'foobaz'
         #
-        e = raises(TypeError, str, u'text', 'supposedly_the_encoding')
+        # two completely corner cases where we differ from CPython:
+        #assert unicode(encoding='supposedly_the_encoding') == u''
+        #assert unicode(errors='supposedly_the_error') == u''
+        e = raises(TypeError, str, u'', 'supposedly_the_encoding')
+        assert str(e.value) == 'decoding str is not supported'
+        e = raises(TypeError, str, u'', errors='supposedly_the_error')
         assert str(e.value) == 'decoding str is not supported'
         e = raises(TypeError, str, u, 'supposedly_the_encoding')
         assert str(e.value) == 'decoding str is not supported'