From b41dc5682c596258d1489a1409fad2d65b5dffd9 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 20 Jun 2018 08:56:45 -0700 Subject: [PATCH] bpo-33904: In IDLE's rstrip, rename class RstripExtension as Rstrip (GH-7811) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit (cherry picked from commit 9bb92235f6272b28d59fcbd04f101fdc6b1bbc50) Co-authored-by: Srinivas Reddy Thatiparthy (శ్రీనివాస్ రెడ్డి తాటిపర్తి) --- Lib/idlelib/editor.py | 4 ++-- Lib/idlelib/idle_test/test_rstrip.py | 4 ++-- Lib/idlelib/rstrip.py | 2 +- .../NEWS.d/next/IDLE/2018-06-20-12-40-54.bpo-33904.qm0eCu.rst | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 Misc/NEWS.d/next/IDLE/2018-06-20-12-40-54.bpo-33904.qm0eCu.rst diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py index f5a091860e..b46316569d 100644 --- a/Lib/idlelib/editor.py +++ b/Lib/idlelib/editor.py @@ -58,7 +58,7 @@ class EditorWindow(object): from idlelib.codecontext import CodeContext from idlelib.paragraph import FormatParagraph from idlelib.parenmatch import ParenMatch - from idlelib.rstrip import RstripExtension + from idlelib.rstrip import Rstrip from idlelib.zoomheight import ZoomHeight filesystemencoding = sys.getfilesystemencoding() # for file names @@ -310,7 +310,7 @@ class EditorWindow(object): scriptbinding = ScriptBinding(self) text.bind("<>", scriptbinding.check_module_event) text.bind("<>", scriptbinding.run_module_event) - text.bind("<>", self.RstripExtension(self).do_rstrip) + text.bind("<>", self.Rstrip(self).do_rstrip) ctip = self.Calltip(self) text.bind("<>", ctip.try_open_calltip_event) #refresh-calltip must come after paren-closed to work right diff --git a/Lib/idlelib/idle_test/test_rstrip.py b/Lib/idlelib/idle_test/test_rstrip.py index 9ef1320eef..2bc7c6f035 100644 --- a/Lib/idlelib/idle_test/test_rstrip.py +++ b/Lib/idlelib/idle_test/test_rstrip.py @@ -9,7 +9,7 @@ class rstripTest(unittest.TestCase): def test_rstrip_line(self): editor = Editor() text = editor.text - do_rstrip = rstrip.RstripExtension(editor).do_rstrip + do_rstrip = rstrip.Rstrip(editor).do_rstrip do_rstrip() self.assertEqual(text.get('1.0', 'insert'), '') @@ -27,7 +27,7 @@ class rstripTest(unittest.TestCase): #from tkinter import Tk #editor = Editor(root=Tk()) text = editor.text - do_rstrip = rstrip.RstripExtension(editor).do_rstrip + do_rstrip = rstrip.Rstrip(editor).do_rstrip original = ( "Line with an ending tab \n" diff --git a/Lib/idlelib/rstrip.py b/Lib/idlelib/rstrip.py index b845d809d3..f93b5e8fc2 100644 --- a/Lib/idlelib/rstrip.py +++ b/Lib/idlelib/rstrip.py @@ -1,6 +1,6 @@ 'Provides "Strip trailing whitespace" under the "Format" menu.' -class RstripExtension: +class Rstrip: def __init__(self, editwin): self.editwin = editwin diff --git a/Misc/NEWS.d/next/IDLE/2018-06-20-12-40-54.bpo-33904.qm0eCu.rst b/Misc/NEWS.d/next/IDLE/2018-06-20-12-40-54.bpo-33904.qm0eCu.rst new file mode 100644 index 0000000000..efed2379b4 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-06-20-12-40-54.bpo-33904.qm0eCu.rst @@ -0,0 +1 @@ +IDLE: In rstrip, rename class RstripExtension as Rstrip -- 2.50.1