cpython: c89a0f24d5f6 (original) (raw)
Mercurial > cpython
changeset 99423:c89a0f24d5f6 2.7
Issue #19543: Added Py3k warning for decoding unicode. [#19543]
| Serhiy Storchaka storchaka@gmail.com | |
|---|---|
| date | Thu, 03 Dec 2015 20:47:48 +0200 |
| parents | ff351607a90d |
| children | 2ae5c51c5dea |
| files | Lib/test/test_unicode.py Misc/NEWS Objects/unicodeobject.c |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-)[+] [-] Lib/test/test_unicode.py 10 Misc/NEWS 2 Objects/unicodeobject.c 3 |
line wrap: on
line diff
--- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -1037,10 +1037,12 @@ class UnicodeTest( self.assertEqual(unicode('Andr\202 x','ascii','ignore'), u"Andr x") self.assertEqual(unicode('Andr\202 x','ascii','replace'), u'Andr\uFFFD x') self.assertEqual(unicode('\202 x', 'ascii', 'replace'), u'\uFFFD x')
self.assertEqual(u'abcde'.decode('ascii', 'ignore'),[](#l1.7)u'abcde'.decode('ascii', errors='ignore'))[](#l1.8)self.assertEqual(u'abcde'.decode('ascii', 'replace'),[](#l1.9)u'abcde'.decode(encoding='ascii', errors='replace'))[](#l1.10)
with test_support.check_py3k_warnings():[](#l1.11)self.assertEqual(u'abcde'.decode('ascii', 'ignore'),[](#l1.12)u'abcde'.decode('ascii', errors='ignore'))[](#l1.13)with test_support.check_py3k_warnings():[](#l1.14)self.assertEqual(u'abcde'.decode('ascii', 'replace'),[](#l1.15)u'abcde'.decode(encoding='ascii', errors='replace'))[](#l1.16)
# Error handling (unknown character names) self.assertEqual("\N{foo}xx".decode("unicode-escape", "ignore"), u"xx")
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ What's New in Python 2.7.12? Core and Builtins ----------------- +- Issue #19543: Added Py3k warning for decoding unicode. +
--- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1288,6 +1288,9 @@ PyObject *PyUnicode_AsDecodedObject(PyOb goto onError; }
+ if (encoding == NULL) encoding = PyUnicode_GetDefaultEncoding();