Skip to content

Commit 939f4a0

Browse files
committed
wrap encoding=None with text_encoding.
1 parent 050bd1b commit 939f4a0

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

Lib/bz2.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ def open(filename, mode="rb", compresslevel=9,
311311
binary_file = BZ2File(filename, bz_mode, compresslevel=compresslevel)
312312

313313
if "t" in mode:
314+
encoding = io.text_encoding(encoding)
314315
return io.TextIOWrapper(binary_file, encoding, errors, newline)
315316
else:
316317
return binary_file

Lib/gzip.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def open(filename, mode="rb", compresslevel=_COMPRESS_LEVEL_BEST,
6262
raise TypeError("filename must be a str or bytes object, or a file")
6363

6464
if "t" in mode:
65+
encoding = io.text_encoding(encoding)
6566
return io.TextIOWrapper(binary_file, encoding, errors, newline)
6667
else:
6768
return binary_file

Lib/lzma.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ def open(filename, mode="rb", *,
302302
preset=preset, filters=filters)
303303

304304
if "t" in mode:
305+
encoding = io.text_encoding(encoding)
305306
return io.TextIOWrapper(binary_file, encoding, errors, newline)
306307
else:
307308
return binary_file

Lib/tempfile.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,9 @@ def NamedTemporaryFile(mode='w+b', buffering=-1, encoding=None,
535535
if _os.name == 'nt' and delete:
536536
flags |= _os.O_TEMPORARY
537537

538+
if "b" not in mode:
539+
encoding = _io.text_encoding(encoding)
540+
538541
(fd, name) = _mkstemp_inner(dir, prefix, suffix, flags, output_type)
539542
try:
540543
file = _io.open(fd, mode, buffering=buffering,
@@ -575,6 +578,9 @@ def TemporaryFile(mode='w+b', buffering=-1, encoding=None,
575578
"""
576579
global _O_TMPFILE_WORKS
577580

581+
if "b" not in mode:
582+
encoding = _io.text_encoding(encoding)
583+
578584
prefix, suffix, dir, output_type = _sanitize_params(prefix, suffix, dir)
579585

580586
flags = _bin_openflags
@@ -630,6 +636,7 @@ def __init__(self, max_size=0, mode='w+b', buffering=-1,
630636
if 'b' in mode:
631637
self._file = _io.BytesIO()
632638
else:
639+
encoding = _io.text_encoding(encoding)
633640
self._file = _io.TextIOWrapper(_io.BytesIO(),
634641
encoding=encoding, errors=errors,
635642
newline=newline)

0 commit comments

Comments
 (0)