From 90c66fe815b3c713818f09977f08b54e227b3328 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 31 Mar 2021 13:20:02 +0900 Subject: [PATCH 1/2] bpo-43510: Accept `encoding="locale"` in binary mode. It make `encoding="locale"` usable everywhere `encoding=None` is allowed. --- Lib/_pyio.py | 2 +- Modules/_io/_iomodule.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/_pyio.py b/Lib/_pyio.py index 0f182d42402063..ba0b0a29b5013d 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -221,7 +221,7 @@ def open(file, mode="r", buffering=-1, encoding=None, errors=None, raise ValueError("can't have read/write/append mode at once") if not (creating or reading or writing or appending): raise ValueError("must have exactly one of read/write/append mode") - if binary and encoding is not None: + if binary and encoding is not None and encoding != "locale": raise ValueError("binary mode doesn't take an encoding argument") if binary and errors is not None: raise ValueError("binary mode doesn't take an errors argument") diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 652c2ce5b0d61f..c627ca257fd5ef 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -346,7 +346,8 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode, goto error; } - if (binary && encoding != NULL) { + if (binary && encoding != NULL + && strcmp(encoding, "locale") != 0) { PyErr_SetString(PyExc_ValueError, "binary mode doesn't take an encoding argument"); goto error; From 018512e984db77ad22fc997d5ceace9b46d74ba3 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 31 Mar 2021 13:42:57 +0900 Subject: [PATCH 2/2] add tests --- Lib/test/test_io.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index c731302a9f22f6..6a9ce39f08eb58 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -531,6 +531,17 @@ class UnseekableWriter(self.MockUnseekableIO): self.assertRaises(OSError, obj.truncate) self.assertRaises(OSError, obj.truncate, 0) + def test_open_binmode_encoding(self): + """open() raises ValueError when encoding is specified in bin mode""" + self.assertRaises(ValueError, self.open, os_helper.TESTFN, + "wb", encoding="utf-8") + + # encoding=None and encoding="locale" is allowed. + with self.open(os_helper.TESTFN, "wb", encoding=None): + pass + with self.open(os_helper.TESTFN, "wb", encoding="locale"): + pass + def test_open_handles_NUL_chars(self): fn_with_NUL = 'foo\0bar' self.assertRaises(ValueError, self.open, fn_with_NUL, 'w')