From b65413b497a07f521d835b799be7dd0afcedbd65 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Thu, 15 Nov 2018 13:15:13 -0500 Subject: bpo-35213: Where appropriate, use 'macOS' in idlelib. (#10478) --- Doc/library/idle.rst | 16 ++++++++-------- Lib/idlelib/config.py | 11 +++++------ Lib/idlelib/help.html | 20 ++++++++++---------- Lib/idlelib/iomenu.py | 4 ++-- Lib/idlelib/macosx.py | 4 ++-- .../IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst | 1 + 6 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index d019bf4..384d2bf 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -20,7 +20,7 @@ IDLE has the following features: * coded in 100% pure Python, using the :mod:`tkinter` GUI toolkit -* cross-platform: works mostly the same on Windows, Unix, and Mac OS X +* cross-platform: works mostly the same on Windows, Unix, and macOS * Python shell window (interactive interpreter) with colorizing of code input, output, and error messages @@ -48,7 +48,7 @@ Output windows, such as used for Edit => Find in Files, are a subtype of editor window. They currently have the same top menu but a different default title and context menu. -On MacOS, there is one application menu. It dynamically changes according +On macOS, there is one application menu. It dynamically changes according to the window currently selected. It has an IDLE menu, and some entries described below are moved around to conform to Apple guidlines. @@ -267,7 +267,7 @@ Options menu (Shell and Editor) Configure IDLE Open a configuration dialog and change preferences for the following: fonts, indentation, keybindings, text color themes, startup windows and - size, additional help sources, and extensions (see below). On OS X, + size, additional help sources, and extensions (see below). On macOS, open the configuration dialog by selecting Preferences in the application menu. To use a new built-in color theme (IDLE Dark) with older IDLEs, save it as a new custom theme. @@ -324,7 +324,7 @@ on Help menu choices. Context Menus ^^^^^^^^^^^^^^^^^^^^^^^^^^ -Open a context menu by right-clicking in a window (Control-click on OS X). +Open a context menu by right-clicking in a window (Control-click on macOS). Context menus have the standard clipboard functions also on the Edit menu. Cut @@ -381,7 +381,7 @@ Key bindings ^^^^^^^^^^^^ In this section, 'C' refers to the :kbd:`Control` key on Windows and Unix and -the :kbd:`Command` key on Mac OSX. +the :kbd:`Command` key on macOS. * :kbd:`Backspace` deletes to the left; :kbd:`Del` deletes to the right @@ -526,9 +526,9 @@ code interactively. IDLE's Shell window also responds to the following keys. Command history * :kbd:`Alt-p` retrieves previous command matching what you have typed. On - OS X use :kbd:`C-p`. + macOS use :kbd:`C-p`. - * :kbd:`Alt-n` retrieves next. On OS X use :kbd:`C-n`. + * :kbd:`Alt-n` retrieves next. On macOS use :kbd:`C-n`. * :kbd:`Return` while on any previous command retrieves that command @@ -796,7 +796,7 @@ changed via Configure IDLE on the Option menu. Keys can be user defined; IDLE ships with four built-in key sets. In addition, a user can create a custom key set in the Configure IDLE dialog under the keys tab. -IDLE on MacOS +IDLE on macOS ^^^^^^^^^^^^^ Under System Preferences: Dock, one can set "Prefer tabs when opening diff --git a/Lib/idlelib/config.py b/Lib/idlelib/config.py index 0eb90fc..79d988f 100644 --- a/Lib/idlelib/config.py +++ b/Lib/idlelib/config.py @@ -562,12 +562,11 @@ class IdleConf: result = self.GetKeySet(self.CurrentKeys()) if sys.platform == "darwin": - # OS X Tk variants do not support the "Alt" keyboard modifier. - # So replace all keybingings that use "Alt" with ones that - # use the "Option" keyboard modifier. - # TODO (Ned?): the "Option" modifier does not work properly for - # Cocoa Tk and XQuartz Tk so we should not use it - # in default OS X KeySets. + # macOS (OS X) Tk variants do not support the "Alt" + # keyboard modifier. Replace it with "Option". + # TODO (Ned?): the "Option" modifier does not work properly + # for Cocoa Tk and XQuartz Tk so we should not use it + # in the default 'OSX' keyset. for k, v in result.items(): v2 = [ x.replace('IDLE has the following features: