[Python-checkins] bpo-33906: Rename idlelib.windows as window (GH-7833)
Miss Islington (bot)
webhook-mailer at python.org
Wed Jun 20 21:45:39 EDT 2018
https://github.com/python/cpython/commit/f9243a22da6a609143e27abf3ca37a4f63d5aae9
commit: f9243a22da6a609143e27abf3ca37a4f63d5aae9
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-06-20T18:45:36-07:00
summary:
bpo-33906: Rename idlelib.windows as window (GH-7833)
Match Window on the main menu and remove last plural module name.
Change imports, test, and attribute references to match new name.
(cherry picked from commit a361e89d5ae3daefe9e8b8a7e889cd2ad8c45b77)
Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>
files:
A Lib/idlelib/idle_test/test_window.py
A Lib/idlelib/window.py
A Misc/NEWS.d/next/IDLE/2018-06-20-19-16-24.bpo-33906.a1lXq0.rst
D Lib/idlelib/idle_test/test_windows.py
D Lib/idlelib/windows.py
M Lib/idlelib/browser.py
M Lib/idlelib/debugger.py
M Lib/idlelib/editor.py
M Lib/idlelib/idle_test/test_config.py
M Lib/idlelib/macosx.py
diff --git a/Lib/idlelib/browser.py b/Lib/idlelib/browser.py
index 447dafcc515e..234883fe8605 100644
--- a/Lib/idlelib/browser.py
+++ b/Lib/idlelib/browser.py
@@ -16,7 +16,7 @@
from idlelib.config import idleConf
from idlelib import pyshell
from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas
-from idlelib.windows import ListedToplevel
+from idlelib.window import ListedToplevel
file_open = None # Method...Item and Class...Item use this.
diff --git a/Lib/idlelib/debugger.py b/Lib/idlelib/debugger.py
index 477b514180c6..09f912c9af33 100644
--- a/Lib/idlelib/debugger.py
+++ b/Lib/idlelib/debugger.py
@@ -6,7 +6,7 @@
from idlelib import macosx
from idlelib.scrolledlist import ScrolledList
-from idlelib.windows import ListedToplevel
+from idlelib.window import ListedToplevel
class Idb(bdb.Bdb):
@@ -40,7 +40,7 @@ def in_rpc_code(self, frame):
prev_name = prev_frame.f_code.co_filename
if 'idlelib' in prev_name and 'debugger' in prev_name:
# catch both idlelib/debugger.py and idlelib/debugger_r.py
- # on both posix and windows
+ # on both Posix and Windows
return False
return self.in_rpc_code(prev_frame)
diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
index b46316569d05..3f034f881007 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -25,7 +25,7 @@
from idlelib import query
from idlelib import replace
from idlelib import search
-from idlelib import windows
+from idlelib import window
# The default tab setting for a Text widget, in average-width characters.
TK_TABWIDTH_DEFAULT = 8
@@ -101,7 +101,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
root = root or flist.root
self.root = root
self.menubar = Menu(root)
- self.top = top = windows.ListedToplevel(root, menu=self.menubar)
+ self.top = top = window.ListedToplevel(root, menu=self.menubar)
if flist:
self.tkinter_vars = flist.vars
#self.top.instance_dict makes flist.inversedict available to
@@ -138,7 +138,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
self.top.protocol("WM_DELETE_WINDOW", self.close)
self.top.bind("<<close-window>>", self.close_event)
if macosx.isAquaTk():
- # Command-W on editorwindows doesn't work without this.
+ # Command-W on editor windows doesn't work without this.
text.bind('<<close-window>>', self.close_event)
# Some OS X systems have only one mouse button, so use
# control-click for popup context menus there. For two
@@ -276,7 +276,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
menu.add_separator()
end = end + 1
self.wmenu_end = end
- windows.register_callback(self.postwindowsmenu)
+ window.register_callback(self.postwindowsmenu)
# Some abstractions so IDLE extensions are cross-IDE
self.askyesno = tkMessageBox.askyesno
@@ -436,14 +436,14 @@ def createmenubar(self):
self.reset_help_menu_entries()
def postwindowsmenu(self):
- # Only called when Windows menu exists
+ # Only called when Window menu exists
menu = self.menudict['windows']
end = menu.index("end")
if end is None:
end = -1
if end > self.wmenu_end:
menu.delete(self.wmenu_end+1, end)
- windows.add_windows_to_menu(menu)
+ window.add_windows_to_menu(menu)
def handle_yview(self, event, *args):
"Handle scrollbar."
@@ -1012,7 +1012,7 @@ def close(self):
def _close(self):
if self.io.filename:
self.update_recent_files_list(new_file=self.io.filename)
- windows.unregister_callback(self.postwindowsmenu)
+ window.unregister_callback(self.postwindowsmenu)
self.unload_extensions()
self.io.close()
self.io = None
diff --git a/Lib/idlelib/idle_test/test_config.py b/Lib/idlelib/idle_test/test_config.py
index e6f553d48471..f3d9f21dd86c 100644
--- a/Lib/idlelib/idle_test/test_config.py
+++ b/Lib/idlelib/idle_test/test_config.py
@@ -255,9 +255,9 @@ def test_get_user_cfg_dir_unix(self):
with self.assertRaises(FileNotFoundError):
conf.GetUserCfgDir()
- @unittest.skipIf(not sys.platform.startswith('win'), 'this is test for windows system')
+ @unittest.skipIf(not sys.platform.startswith('win'), 'this is test for Windows system')
def test_get_user_cfg_dir_windows(self):
- "Test to get user config directory under windows"
+ "Test to get user config directory under Windows"
conf = self.new_config(_utest=True)
# Check normal way should success
diff --git a/Lib/idlelib/idle_test/test_windows.py b/Lib/idlelib/idle_test/test_window.py
similarity index 75%
rename from Lib/idlelib/idle_test/test_windows.py
rename to Lib/idlelib/idle_test/test_window.py
index 425a5691f93e..5a2645b9cc27 100644
--- a/Lib/idlelib/idle_test/test_windows.py
+++ b/Lib/idlelib/idle_test/test_window.py
@@ -1,6 +1,6 @@
-"Test windows, coverage 47%."
+"Test window, coverage 47%."
-from idlelib import windows
+from idlelib import window
import unittest
from test.support import requires
from tkinter import Tk
@@ -9,7 +9,7 @@
class WindowListTest(unittest.TestCase):
def test_init(self):
- wl = windows.WindowList()
+ wl = window.WindowList()
self.assertEqual(wl.dict, {})
self.assertEqual(wl.callbacks, [])
@@ -20,14 +20,14 @@ class ListedToplevelTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
- windows.registry = set()
+ window.registry = set()
requires('gui')
cls.root = Tk()
cls.root.withdraw()
@classmethod
def tearDownClass(cls):
- windows.registry = windows.WindowList()
+ window.registry = window.WindowList()
cls.root.update_idletasks()
## for id in cls.root.tk.call('after', 'info'):
## cls.root.after_cancel(id) # Need for EditorWindow.
@@ -36,8 +36,8 @@ def tearDownClass(cls):
def test_init(self):
- win = windows.ListedToplevel(self.root)
- self.assertIn(win, windows.registry)
+ win = window.ListedToplevel(self.root)
+ self.assertIn(win, window.registry)
self.assertEqual(win.focused_widget, win)
diff --git a/Lib/idlelib/macosx.py b/Lib/idlelib/macosx.py
index d85278a0b765..3d296123d58c 100644
--- a/Lib/idlelib/macosx.py
+++ b/Lib/idlelib/macosx.py
@@ -128,7 +128,7 @@ def overrideRootMenu(root, flist):
# menu.
from tkinter import Menu
from idlelib import mainmenu
- from idlelib import windows
+ from idlelib import window
closeItem = mainmenu.menudefs[0][1][-2]
diff --git a/Lib/idlelib/windows.py b/Lib/idlelib/window.py
similarity index 95%
rename from Lib/idlelib/windows.py
rename to Lib/idlelib/window.py
index b1e50384e941..b2488b28cabe 100644
--- a/Lib/idlelib/windows.py
+++ b/Lib/idlelib/window.py
@@ -87,11 +87,11 @@ def wakeup(self):
self.tkraise()
self.focused_widget.focus_set()
except TclError:
- # This can happen when the window menu was torn off.
+ # This can happen when the Window menu was torn off.
# Simply ignore it.
pass
if __name__ == "__main__":
from unittest import main
- main('idlelib.idle_test.test_windows', verbosity=2)
+ main('idlelib.idle_test.test_window', verbosity=2)
diff --git a/Misc/NEWS.d/next/IDLE/2018-06-20-19-16-24.bpo-33906.a1lXq0.rst b/Misc/NEWS.d/next/IDLE/2018-06-20-19-16-24.bpo-33906.a1lXq0.rst
new file mode 100644
index 000000000000..141122c3128b
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2018-06-20-19-16-24.bpo-33906.a1lXq0.rst
@@ -0,0 +1,2 @@
+Rename idlelib.windows as window Match Window on the main menu and remove
+last plural module name.
More information about the Python-checkins
mailing list