From 8bf694138084693df1e45ba4e83bd17edf897047 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Mon, 12 Feb 2018 17:16:19 -0500 Subject: [PATCH 1/2] bpo-32837: IDLE - require encoding argument for textview.view_file. Using the system and place-dependent default encoding for open() is a bad idea for IDLE's system and location-independent files. --- Lib/idlelib/idle_test/test_textview.py | 7 ++++--- Lib/idlelib/textview.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Lib/idlelib/idle_test/test_textview.py b/Lib/idlelib/idle_test/test_textview.py index c129c2f0819a2f..dfd4063eb08d1e 100644 --- a/Lib/idlelib/idle_test/test_textview.py +++ b/Lib/idlelib/idle_test/test_textview.py @@ -112,7 +112,7 @@ def test_view_text(self): view.ok() def test_view_file(self): - view = tv.view_file(root, 'Title', __file__, modal=False) + view = tv.view_file(root, 'Title', __file__, 'ascii', modal=False) self.assertIsInstance(view, tv.ViewWindow) self.assertIsInstance(view.viewframe, tv.ViewFrame) get = view.viewframe.textframe.text.get @@ -121,7 +121,7 @@ def test_view_file(self): def test_bad_file(self): # Mock showerror will be used; view_file will return None. - view = tv.view_file(root, 'Title', 'abc.xyz', modal=False) + view = tv.view_file(root, 'Title', 'abc.xyz', 'ascii', modal=False) self.assertIsNone(view) self.assertEqual(tv.showerror.title, 'File Load Error') @@ -161,7 +161,8 @@ def _command(): def test_view_file_bind_with_button(self): def _command(): self.called = True - self.view = tv.view_file(root, 'TITLE_FILE', __file__, _utest=True) + self.view = tv.view_file(root, 'TITLE_FILE', __file__, + encoding='ascii', _utest=True) button = Button(root, text='BUTTON', command=_command) button.invoke() self.addCleanup(button.destroy) diff --git a/Lib/idlelib/textview.py b/Lib/idlelib/textview.py index e3b55065c6d9cc..66201344061090 100644 --- a/Lib/idlelib/textview.py +++ b/Lib/idlelib/textview.py @@ -107,7 +107,7 @@ def view_text(parent, title, text, modal=True, _utest=False): return ViewWindow(parent, title, text, modal, _utest=_utest) -def view_file(parent, title, filename, encoding=None, modal=True, _utest=False): +def view_file(parent, title, filename, encoding, modal=True, _utest=False): """Create text viewer for text in filename. Return error message if file cannot be read. Otherwise calls view_text From 58099936c5daf9e5ef214e88bf66b26097c4060b Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Mon, 12 Feb 2018 17:23:13 -0500 Subject: [PATCH 2/2] blurb --- Misc/NEWS.d/next/IDLE/2018-02-12-17-22-48.bpo-32837.-33QPl.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/IDLE/2018-02-12-17-22-48.bpo-32837.-33QPl.rst diff --git a/Misc/NEWS.d/next/IDLE/2018-02-12-17-22-48.bpo-32837.-33QPl.rst b/Misc/NEWS.d/next/IDLE/2018-02-12-17-22-48.bpo-32837.-33QPl.rst new file mode 100644 index 00000000000000..258536a1cd0c6b --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-02-12-17-22-48.bpo-32837.-33QPl.rst @@ -0,0 +1,2 @@ +Using the system and place-dependent default encoding for open() is a bad +idea for IDLE's system and location-independent files.