Skip to content

Commit a361e89

Browse files
terryjreedyterryjreedy
authored
bpo-33906: Rename idlelib.windows as window (python#7833)
Match Window on the main menu and remove last plural module name. Change imports, test, and attribute references to match new name.
1 parent 87a9273 commit a361e89

File tree

8 files changed

+24
-22
lines changed

8 files changed

+24
-22
lines changed

‎Lib/idlelib/browser.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from idlelib.config import idleConf
1717
from idlelib import pyshell
1818
from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas
19-
from idlelib.windows import ListedToplevel
19+
from idlelib.window import ListedToplevel
2020

2121

2222
file_open = None # Method...Item and Class...Item use this.

‎Lib/idlelib/debugger.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from idlelib import macosx
88
from idlelib.scrolledlist import ScrolledList
9-
from idlelib.windows import ListedToplevel
9+
from idlelib.window import ListedToplevel
1010

1111

1212
class Idb(bdb.Bdb):
@@ -40,7 +40,7 @@ def in_rpc_code(self, frame):
4040
prev_name = prev_frame.f_code.co_filename
4141
if 'idlelib' in prev_name and 'debugger' in prev_name:
4242
# catch both idlelib/debugger.py and idlelib/debugger_r.py
43-
# on both posix and windows
43+
# on both Posix and Windows
4444
return False
4545
return self.in_rpc_code(prev_frame)
4646

‎Lib/idlelib/editor.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from idlelib import query
2626
from idlelib import replace
2727
from idlelib import search
28-
from idlelib import windows
28+
from idlelib import window
2929

3030
# The default tab setting for a Text widget, in average-width characters.
3131
TK_TABWIDTH_DEFAULT = 8
@@ -101,7 +101,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
101101
root = root or flist.root
102102
self.root = root
103103
self.menubar = Menu(root)
104-
self.top = top = windows.ListedToplevel(root, menu=self.menubar)
104+
self.top = top = window.ListedToplevel(root, menu=self.menubar)
105105
if flist:
106106
self.tkinter_vars = flist.vars
107107
#self.top.instance_dict makes flist.inversedict available to
@@ -138,7 +138,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
138138
self.top.protocol("WM_DELETE_WINDOW", self.close)
139139
self.top.bind("<<close-window>>", self.close_event)
140140
if macosx.isAquaTk():
141-
# Command-W on editorwindows doesn't work without this.
141+
# Command-W on editor windows doesn't work without this.
142142
text.bind('<<close-window>>', self.close_event)
143143
# Some OS X systems have only one mouse button, so use
144144
# control-click for popup context menus there. For two
@@ -276,7 +276,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
276276
menu.add_separator()
277277
end = end + 1
278278
self.wmenu_end = end
279-
windows.register_callback(self.postwindowsmenu)
279+
window.register_callback(self.postwindowsmenu)
280280

281281
# Some abstractions so IDLE extensions are cross-IDE
282282
self.askyesno = tkMessageBox.askyesno
@@ -436,14 +436,14 @@ def createmenubar(self):
436436
self.reset_help_menu_entries()
437437

438438
def postwindowsmenu(self):
439-
# Only called when Windows menu exists
439+
# Only called when Window menu exists
440440
menu = self.menudict['windows']
441441
end = menu.index("end")
442442
if end is None:
443443
end = -1
444444
if end > self.wmenu_end:
445445
menu.delete(self.wmenu_end+1, end)
446-
windows.add_windows_to_menu(menu)
446+
window.add_windows_to_menu(menu)
447447

448448
def handle_yview(self, event, *args):
449449
"Handle scrollbar."
@@ -1012,7 +1012,7 @@ def close(self):
10121012
def _close(self):
10131013
if self.io.filename:
10141014
self.update_recent_files_list(new_file=self.io.filename)
1015-
windows.unregister_callback(self.postwindowsmenu)
1015+
window.unregister_callback(self.postwindowsmenu)
10161016
self.unload_extensions()
10171017
self.io.close()
10181018
self.io = None

‎Lib/idlelib/idle_test/test_config.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,9 @@ def test_get_user_cfg_dir_unix(self):
255255
with self.assertRaises(FileNotFoundError):
256256
conf.GetUserCfgDir()
257257

258-
@unittest.skipIf(not sys.platform.startswith('win'), 'this is test for windows system')
258+
@unittest.skipIf(not sys.platform.startswith('win'), 'this is test for Windows system')
259259
def test_get_user_cfg_dir_windows(self):
260-
"Test to get user config directory under windows"
260+
"Test to get user config directory under Windows"
261261
conf = self.new_config(_utest=True)
262262

263263
# Check normal way should success

Lib/idlelib/idle_test/test_windows.py renamed to Lib/idlelib/idle_test/test_window.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
"Test windows, coverage 47%."
1+
"Test window, coverage 47%."
22

3-
from idlelib import windows
3+
from idlelib import window
44
import unittest
55
from test.support import requires
66
from tkinter import Tk
@@ -9,7 +9,7 @@
99
class WindowListTest(unittest.TestCase):
1010

1111
def test_init(self):
12-
wl = windows.WindowList()
12+
wl = window.WindowList()
1313
self.assertEqual(wl.dict, {})
1414
self.assertEqual(wl.callbacks, [])
1515

@@ -20,14 +20,14 @@ class ListedToplevelTest(unittest.TestCase):
2020

2121
@classmethod
2222
def setUpClass(cls):
23-
windows.registry = set()
23+
window.registry = set()
2424
requires('gui')
2525
cls.root = Tk()
2626
cls.root.withdraw()
2727

2828
@classmethod
2929
def tearDownClass(cls):
30-
windows.registry = windows.WindowList()
30+
window.registry = window.WindowList()
3131
cls.root.update_idletasks()
3232
## for id in cls.root.tk.call('after', 'info'):
3333
## cls.root.after_cancel(id) # Need for EditorWindow.
@@ -36,8 +36,8 @@ def tearDownClass(cls):
3636

3737
def test_init(self):
3838

39-
win = windows.ListedToplevel(self.root)
40-
self.assertIn(win, windows.registry)
39+
win = window.ListedToplevel(self.root)
40+
self.assertIn(win, window.registry)
4141
self.assertEqual(win.focused_widget, win)
4242

4343

‎Lib/idlelib/macosx.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def overrideRootMenu(root, flist):
128128
# menu.
129129
from tkinter import Menu
130130
from idlelib import mainmenu
131-
from idlelib import windows
131+
from idlelib import window
132132

133133
closeItem = mainmenu.menudefs[0][1][-2]
134134

Lib/idlelib/windows.py renamed to Lib/idlelib/window.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ def wakeup(self):
8787
self.tkraise()
8888
self.focused_widget.focus_set()
8989
except TclError:
90-
# This can happen when the window menu was torn off.
90+
# This can happen when the Window menu was torn off.
9191
# Simply ignore it.
9292
pass
9393

9494

9595
if __name__ == "__main__":
9696
from unittest import main
97-
main('idlelib.idle_test.test_windows', verbosity=2)
97+
main('idlelib.idle_test.test_window', verbosity=2)

‎Misc/NEWS.d/next/IDLE/2018-06-20-19-16-24.bpo-33906.a1lXq0.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Rename idlelib.windows as window Match Window on the main menu and remove
2+
last plural module name.

0 commit comments

Comments
 (0)