bpo-41152: IDLE: always use UTF-8 for standard IO streams (GH-21214)
(cherry picked from commit 2515a28230
)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
parent
dc8ce8ead1
commit
00fd04b9b7
|
@ -3,6 +3,9 @@ Released on 2020-07-03?
|
|||
======================================
|
||||
|
||||
|
||||
bpo-41152: The encoding of ``stdin``, ``stdout`` and ``stderr`` in IDLE
|
||||
is now always UTF-8.
|
||||
|
||||
bpo-41144: Make Open Module open a special module such as os.path.
|
||||
|
||||
bpo-40723: Make test_idle pass when run after import.
|
||||
|
|
|
@ -58,11 +58,6 @@ class OutputWindowTest(unittest.TestCase):
|
|||
get = self.text.get
|
||||
write = self.window.write
|
||||
|
||||
# Test bytes.
|
||||
b = b'Test bytes.'
|
||||
eq(write(b), len(b))
|
||||
eq(get('1.0', '1.end'), b.decode())
|
||||
|
||||
# No new line - insert stays on same line.
|
||||
delete('1.0', 'end')
|
||||
test_text = 'test text'
|
||||
|
|
|
@ -13,52 +13,12 @@ from tkinter.simpledialog import askstring
|
|||
import idlelib
|
||||
from idlelib.config import idleConf
|
||||
|
||||
if idlelib.testing: # Set True by test.test_idle to avoid setlocale.
|
||||
encoding = 'utf-8'
|
||||
errors = 'surrogateescape'
|
||||
else:
|
||||
# Try setting the locale, so that we can find out
|
||||
# what encoding to use
|
||||
try:
|
||||
import locale
|
||||
locale.setlocale(locale.LC_CTYPE, "")
|
||||
except (ImportError, locale.Error):
|
||||
pass
|
||||
|
||||
if sys.platform == 'win32':
|
||||
encoding = 'utf-8'
|
||||
errors = 'surrogateescape'
|
||||
errors = 'surrogatepass'
|
||||
else:
|
||||
try:
|
||||
# Different things can fail here: the locale module may not be
|
||||
# loaded, it may not offer nl_langinfo, or CODESET, or the
|
||||
# resulting codeset may be unknown to Python. We ignore all
|
||||
# these problems, falling back to ASCII
|
||||
locale_encoding = locale.nl_langinfo(locale.CODESET)
|
||||
if locale_encoding:
|
||||
codecs.lookup(locale_encoding)
|
||||
except (NameError, AttributeError, LookupError):
|
||||
# Try getdefaultlocale: it parses environment variables,
|
||||
# which may give a clue. Unfortunately, getdefaultlocale has
|
||||
# bugs that can cause ValueError.
|
||||
try:
|
||||
locale_encoding = locale.getdefaultlocale()[1]
|
||||
if locale_encoding:
|
||||
codecs.lookup(locale_encoding)
|
||||
except (ValueError, LookupError):
|
||||
pass
|
||||
errors = 'surrogateescape'
|
||||
|
||||
if locale_encoding:
|
||||
encoding = locale_encoding.lower()
|
||||
errors = 'strict'
|
||||
else:
|
||||
# POSIX locale or macOS
|
||||
encoding = 'ascii'
|
||||
errors = 'surrogateescape'
|
||||
# Encoding is used in multiple files; locale_encoding nowhere.
|
||||
# The only use of 'encoding' below is in _decode as initial value
|
||||
# of deprecated block asking user for encoding.
|
||||
# Perhaps use elsewhere should be reviewed.
|
||||
|
||||
coding_re = re.compile(r'^[ \t\f]*#.*?coding[:=][ \t]*([-\w.]+)', re.ASCII)
|
||||
blank_re = re.compile(r'^[ \t\f]*(?:[#\r\n]|$)', re.ASCII)
|
||||
|
|
|
@ -6,7 +6,6 @@ import re
|
|||
from tkinter import messagebox
|
||||
|
||||
from idlelib.editor import EditorWindow
|
||||
from idlelib import iomenu
|
||||
|
||||
|
||||
file_line_pats = [
|
||||
|
@ -110,8 +109,7 @@ class OutputWindow(EditorWindow):
|
|||
Return:
|
||||
Length of text inserted.
|
||||
"""
|
||||
if isinstance(s, bytes):
|
||||
s = s.decode(iomenu.encoding, "replace")
|
||||
assert isinstance(s, str)
|
||||
self.text.insert(mark, s, tags)
|
||||
self.text.see(mark)
|
||||
self.text.update()
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
The encoding of ``stdin``, ``stdout`` and ``stderr`` in IDLE is now always
|
||||
UTF-8.
|
Loading…
Reference in New Issue