Mailman 3 November 2018 - Python-checkins

bpo-35239: _PySys_EndInit() copies module_search_path (GH-10532)
by Miss Islington (bot) 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/d2be9a5c13221fb84c2221bbfd93efac61… commit: d2be9a5c13221fb84c2221bbfd93efac6111e697 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-16T03:34:35-08:00 summary: bpo-35239: _PySys_EndInit() copies module_search_path (GH-10532) * The _PySys_EndInit() function now copies the config->module_search_path list, so config is longer modified when sys.path is updated. * config->warnoptions list and config->xoptions dict are also copied * test_embed: InitConfigTests now also tests main_config['module_search_path'] * Fix _Py_InitializeMainInterpreter(): don't use config->warnoptions but sys.warnoptions to decide if the warnings module should be imported at startup. (cherry picked from commit 37cd982df02795905886ab36a2378ed557cb6f60) Co-authored-by: Victor Stinner <vstinner(a)redhat.com> files: M Lib/test/test_embed.py M Python/pylifecycle.c M Python/sysmodule.c diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py index 81f64f5048ac..e6c8c8070b86 100644 --- a/Lib/test/test_embed.py +++ b/Lib/test/test_embed.py @@ -301,10 +301,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase): } # main config - UNTESTED_MAIN_CONFIG = ( - # FIXME: untested main configuration variables - 'module_search_path', - ) COPY_MAIN_CONFIG = ( # Copy core config to main config for expected values 'argv', @@ -315,7 +311,8 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase): 'install_signal_handlers', 'prefix', 'warnoptions', - # xoptions is created from core_config in check_main_config() + # xoptions is created from core_config in check_main_config(). + # 'module_search_paths' is copied to 'module_search_path'. ) # global config @@ -389,12 +386,10 @@ def check_main_config(self, config): main_config = config['main_config'] # main config - for key in self.UNTESTED_MAIN_CONFIG: - del main_config[key] - expected_main = {} for key in self.COPY_MAIN_CONFIG: expected_main[key] = core_config[key] + expected_main['module_search_path'] = core_config['module_search_paths'] expected_main['xoptions'] = self.main_xoptions(core_config['xoptions']) self.assertEqual(main_config, expected_main) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 86f95de8336f..7eaf376d1a6a 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -967,8 +967,8 @@ _Py_InitializeMainInterpreter(PyInterpreterState *interp, } /* Initialize warnings. */ - if (interp->config.warnoptions != NULL && - PyList_Size(interp->config.warnoptions) > 0) + PyObject *warnoptions = PySys_GetObject("warnoptions"); + if (warnoptions != NULL && PyList_Size(warnoptions) > 0) { PyObject *warnings_module = PyImport_ImportModule("warnings"); if (warnings_module == NULL) { diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 498fa91fcc3d..48d8fa4c6e04 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -2464,7 +2464,20 @@ _PySys_EndInit(PyObject *sysdict, _PyMainInterpreterConfig *config) assert(config->exec_prefix != NULL); assert(config->base_exec_prefix != NULL); - SET_SYS_FROM_STRING_BORROW("path", config->module_search_path); +#define COPY_LIST(KEY, ATTR) \ + do { \ + assert(PyList_Check(config->ATTR)); \ + PyObject *list = PyList_GetSlice(config->ATTR, \ + 0, PyList_GET_SIZE(config->ATTR)); \ + if (list == NULL) { \ + return -1; \ + } \ + SET_SYS_FROM_STRING_BORROW(KEY, list); \ + Py_DECREF(list); \ + } while (0) + + COPY_LIST("path", module_search_path); + SET_SYS_FROM_STRING_BORROW("executable", config->executable); SET_SYS_FROM_STRING_BORROW("prefix", config->prefix); SET_SYS_FROM_STRING_BORROW("base_prefix", config->base_prefix); @@ -2475,12 +2488,19 @@ _PySys_EndInit(PyObject *sysdict, _PyMainInterpreterConfig *config) SET_SYS_FROM_STRING_BORROW("argv", config->argv); } if (config->warnoptions != NULL) { - SET_SYS_FROM_STRING_BORROW("warnoptions", config->warnoptions); + COPY_LIST("warnoptions", warnoptions); } if (config->xoptions != NULL) { - SET_SYS_FROM_STRING_BORROW("_xoptions", config->xoptions); + PyObject *dict = PyDict_Copy(config->xoptions); + if (dict == NULL) { + return -1; + } + SET_SYS_FROM_STRING_BORROW("_xoptions", dict); + Py_DECREF(dict); } +#undef COPY_LIST + /* Set flags to their final values */ SET_SYS_FROM_STRING_INT_RESULT("flags", make_flags()); /* prevent user from creating new instances */

1 0

bpo-35239: _PySys_EndInit() copies module_search_path (GH-10532)
by Victor Stinner 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/37cd982df02795905886ab36a2378ed557… commit: 37cd982df02795905886ab36a2378ed557cb6f60 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-11-16T11:55:35+01:00 summary: bpo-35239: _PySys_EndInit() copies module_search_path (GH-10532) * The _PySys_EndInit() function now copies the config->module_search_path list, so config is longer modified when sys.path is updated. * config->warnoptions list and config->xoptions dict are also copied * test_embed: InitConfigTests now also tests main_config['module_search_path'] * Fix _Py_InitializeMainInterpreter(): don't use config->warnoptions but sys.warnoptions to decide if the warnings module should be imported at startup. files: M Lib/test/test_embed.py M Python/pylifecycle.c M Python/sysmodule.c diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py index 75e31c211122..3f383d7fd50c 100644 --- a/Lib/test/test_embed.py +++ b/Lib/test/test_embed.py @@ -331,10 +331,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase): }) # main config - UNTESTED_MAIN_CONFIG = ( - # FIXME: untested main configuration variables - 'module_search_path', - ) COPY_MAIN_CONFIG = ( # Copy core config to main config for expected values 'argv', @@ -346,7 +342,8 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase): 'prefix', 'pycache_prefix', 'warnoptions', - # xoptions is created from core_config in check_main_config() + # xoptions is created from core_config in check_main_config(). + # 'module_search_paths' is copied to 'module_search_path'. ) # global config @@ -426,12 +423,10 @@ def check_main_config(self, config): main_config = config['main_config'] # main config - for key in self.UNTESTED_MAIN_CONFIG: - del main_config[key] - expected_main = {} for key in self.COPY_MAIN_CONFIG: expected_main[key] = core_config[key] + expected_main['module_search_path'] = core_config['module_search_paths'] expected_main['xoptions'] = self.main_xoptions(core_config['xoptions']) self.assertEqual(main_config, expected_main) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 4ccea2ece207..58e16473100e 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -836,8 +836,8 @@ _Py_InitializeMainInterpreter(PyInterpreterState *interp, } /* Initialize warnings. */ - if (interp->config.warnoptions != NULL && - PyList_Size(interp->config.warnoptions) > 0) + PyObject *warnoptions = PySys_GetObject("warnoptions"); + if (warnoptions != NULL && PyList_Size(warnoptions) > 0) { PyObject *warnings_module = PyImport_ImportModule("warnings"); if (warnings_module == NULL) { diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 99cab2b4d9e3..2284e88d4c11 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -2488,7 +2488,20 @@ _PySys_EndInit(PyObject *sysdict, PyInterpreterState *interp) assert(config->exec_prefix != NULL); assert(config->base_exec_prefix != NULL); - SET_SYS_FROM_STRING_BORROW("path", config->module_search_path); +#define COPY_LIST(KEY, ATTR) \ + do { \ + assert(PyList_Check(config->ATTR)); \ + PyObject *list = PyList_GetSlice(config->ATTR, \ + 0, PyList_GET_SIZE(config->ATTR)); \ + if (list == NULL) { \ + return -1; \ + } \ + SET_SYS_FROM_STRING_BORROW(KEY, list); \ + Py_DECREF(list); \ + } while (0) + + COPY_LIST("path", module_search_path); + SET_SYS_FROM_STRING_BORROW("executable", config->executable); SET_SYS_FROM_STRING_BORROW("prefix", config->prefix); SET_SYS_FROM_STRING_BORROW("base_prefix", config->base_prefix); @@ -2505,12 +2518,19 @@ _PySys_EndInit(PyObject *sysdict, PyInterpreterState *interp) SET_SYS_FROM_STRING_BORROW("argv", config->argv); } if (config->warnoptions != NULL) { - SET_SYS_FROM_STRING_BORROW("warnoptions", config->warnoptions); + COPY_LIST("warnoptions", warnoptions); } if (config->xoptions != NULL) { - SET_SYS_FROM_STRING_BORROW("_xoptions", config->xoptions); + PyObject *dict = PyDict_Copy(config->xoptions); + if (dict == NULL) { + return -1; + } + SET_SYS_FROM_STRING_BORROW("_xoptions", dict); + Py_DECREF(dict); } +#undef COPY_LIST + /* Set flags to their final values */ SET_SYS_FROM_STRING_INT_RESULT("flags", make_flags()); /* prevent user from creating new instances */

1 0

Daily reference leaks (4243df51fe43): sum=5
by solipsis＠pitrou.net 16 Nov '18

16 Nov '18

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [0, 7, -7] memory blocks, sum=0 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_forkserver leaked [1, -2, 2] memory blocks, sum=1 test_multiprocessing_spawn leaked [1, -2, 1] memory blocks, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogtLsXd4', '--timeout', '7200']

1 0

bpo-35213: Where appropriate, use 'macOS' in idlelib. (GH-10478)
by Miss Islington (bot) 15 Nov '18

15 Nov '18

https://github.com/python/cpython/commit/be657c1fac3ce436976541cf2680a97721… commit: be657c1fac3ce436976541cf2680a977217be813 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-15T11:31:52-08:00 summary: bpo-35213: Where appropriate, use 'macOS' in idlelib. (GH-10478) (cherry picked from commit b65413b497a07f521d835b799be7dd0afcedbd65) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: A Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst M Doc/library/idle.rst M Lib/idlelib/config.py M Lib/idlelib/help.html M Lib/idlelib/iomenu.py M Lib/idlelib/macosx.py diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index b91a3402f691..964d492e9093 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 0eb90fc8dc5f..79d988f9a186 100644 --- a/Lib/idlelib/config.py +++ b/Lib/idlelib/config.py @@ -562,12 +562,11 @@ def GetCurrentKeySet(self): 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('<Alt-', '<Option-') for x in v ] if v != v2: diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index a8afc75c316c..e2bf773478e8 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -108,7 +108,7 @@ <h3>Navigation</h3> <p>IDLE has the following features:</p> <ul class="simple"> <li>coded in 100% pure Python, using the <a class="reference internal" href="tkinter.html#module-tkinter" title="tkinter: Interface to Tcl/Tk for graphical user interfaces"><code class="xref py py-mod docutils literal notranslate"><span class="pre">tkinter</span></code></a> GUI toolkit</li> -<li>cross-platform: works mostly the same on Windows, Unix, and Mac OS X</li> +<li>cross-platform: works mostly the same on Windows, Unix, and macOS</li> <li>Python shell window (interactive interpreter) with colorizing of code input, output, and error messages</li> <li>multi-window text editor with multiple undo, Python colorizing, @@ -128,7 +128,7 @@ <h2>Menus<a class="headerlink" href="#menus" title="Permalink to this headline"> <p>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.</p> -<p>On MacOS, there is one application menu. It dynamically changes according +<p>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.</p> <div class="section" id="file-menu-shell-and-editor"> @@ -304,7 +304,7 @@ <h3>Options menu (Shell and Editor)<a class="headerlink" href="#options-menu-she <dt>Configure IDLE</dt> <dd><p class="first">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.</p> @@ -349,7 +349,7 @@ <h3>Help menu (Shell and Editor)<a class="headerlink" href="#help-menu-shell-and </div> <div class="section" id="context-menus"> <span id="index-4"></span><h3>Context Menus<a class="headerlink" href="#context-menus" title="Permalink to this headline">¶</a></h3> -<p>Open a context menu by right-clicking in a window (Control-click on OS X). +<p>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.</p> <dl class="docutils"> <dt>Cut</dt> @@ -399,7 +399,7 @@ <h3>Editor windows<a class="headerlink" href="#editor-windows" title="Permalink <div class="section" id="key-bindings"> <h3>Key bindings<a class="headerlink" href="#key-bindings" title="Permalink to this headline">¶</a></h3> <p>In this section, ‘C’ refers to the <kbd class="kbd docutils literal notranslate">Control</kbd> key on Windows and Unix and -the <kbd class="kbd docutils literal notranslate">Command</kbd> key on Mac OSX.</p> +the <kbd class="kbd docutils literal notranslate">Command</kbd> key on macOS.</p> <ul> <li><p class="first"><kbd class="kbd docutils literal notranslate">Backspace</kbd> deletes to the left; <kbd class="kbd docutils literal notranslate">Del</kbd> deletes to the right</p> </li> @@ -521,8 +521,8 @@ <h3>Python Shell window<a class="headerlink" href="#python-shell-window" title=" <p>Command history</p> <ul class="simple"> <li><kbd class="kbd docutils literal notranslate">Alt-p</kbd> retrieves previous command matching what you have typed. On -OS X use <kbd class="kbd docutils literal notranslate">C-p</kbd>.</li> -<li><kbd class="kbd docutils literal notranslate">Alt-n</kbd> retrieves next. On OS X use <kbd class="kbd docutils literal notranslate">C-n</kbd>.</li> +macOS use <kbd class="kbd docutils literal notranslate">C-p</kbd>.</li> +<li><kbd class="kbd docutils literal notranslate">Alt-n</kbd> retrieves next. On macOS use <kbd class="kbd docutils literal notranslate">C-n</kbd>.</li> <li><kbd class="kbd docutils literal notranslate">Return</kbd> while on any previous command retrieves that command</li> </ul> </li> @@ -757,7 +757,7 @@ <h3>Setting preferences<a class="headerlink" href="#setting-preferences" title=" custom key set in the Configure IDLE dialog under the keys tab.</p> </div> <div class="section" id="idle-on-macos"> -<h3>IDLE on MacOS<a class="headerlink" href="#idle-on-macos" title="Permalink to this headline">¶</a></h3> +<h3>IDLE on macOS<a class="headerlink" href="#idle-on-macos" title="Permalink to this headline">¶</a></h3> <p>Under System Preferences: Dock, one can set “Prefer tabs when opening documents” to “Always”. This setting is not compatible with the tk/tkinter GUI framework used by IDLE, and it breaks a few IDLE features.</p> @@ -817,7 +817,7 @@ <h3><a href="../contents.html">Table of Contents</a></h3> <li><a class="reference internal" href="#help-and-preferences">Help and preferences</a><ul> <li><a class="reference internal" href="#help-sources">Help sources</a></li> <li><a class="reference internal" href="#setting-preferences">Setting preferences</a></li> -<li><a class="reference internal" href="#idle-on-macos">IDLE on MacOS</a></li> +<li><a class="reference internal" href="#idle-on-macos">IDLE on macOS</a></li> <li><a class="reference internal" href="#extensions">Extensions</a></li> </ul> </li> @@ -899,7 +899,7 @@ <h3>Navigation</h3> <br /> <br /> - Last updated on Nov 10, 2018. + Last updated on Nov 12, 2018. <a href="https://docs.python.org/3/bugs.html">Found a bug</a>? <br /> diff --git a/Lib/idlelib/iomenu.py b/Lib/idlelib/iomenu.py index fcd8dcc1393d..f5bced597aa8 100644 --- a/Lib/idlelib/iomenu.py +++ b/Lib/idlelib/iomenu.py @@ -41,7 +41,7 @@ # these problems, falling back to ASCII locale_encoding = locale.nl_langinfo(locale.CODESET) if locale_encoding is None or locale_encoding == '': - # situation occurs on Mac OS X + # situation occurs on macOS locale_encoding = 'ascii' codecs.lookup(locale_encoding) except (NameError, AttributeError, LookupError): @@ -51,7 +51,7 @@ try: locale_encoding = locale.getdefaultlocale()[1] if locale_encoding is None or locale_encoding == '': - # situation occurs on Mac OS X + # situation occurs on macOS locale_encoding = 'ascii' codecs.lookup(locale_encoding) except (ValueError, LookupError): diff --git a/Lib/idlelib/macosx.py b/Lib/idlelib/macosx.py index d3ae224100cf..8f8484a37015 100644 --- a/Lib/idlelib/macosx.py +++ b/Lib/idlelib/macosx.py @@ -1,5 +1,5 @@ """ -A number of functions that enhance IDLE on Mac OSX. +A number of functions that enhance IDLE on macOS. """ from sys import platform # Used in _init_tk_type, changed by test. @@ -192,7 +192,7 @@ def help_dialog(event=None): root.bind('<<close-all-windows>>', flist.close_all_callback) # The binding above doesn't reliably work on all versions of Tk - # on MacOSX. Adding command definition below does seem to do the + # on macOS. Adding command definition below does seem to do the # right thing for now. root.createcommand('exit', flist.close_all_callback) diff --git a/Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst b/Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst new file mode 100644 index 000000000000..9d0e4e1220bb --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst @@ -0,0 +1 @@ +Where appropriate, use 'macOS' in idlelib.

1 0

bpo-35213: Where appropriate, use 'macOS' in idlelib. (GH-10478)
by Miss Islington (bot) 15 Nov '18

15 Nov '18

https://github.com/python/cpython/commit/579c4175648f667d59954d48ada757621f… commit: 579c4175648f667d59954d48ada757621ff6d433 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-15T11:31:31-08:00 summary: bpo-35213: Where appropriate, use 'macOS' in idlelib. (GH-10478) (cherry picked from commit b65413b497a07f521d835b799be7dd0afcedbd65) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: A Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst M Doc/library/idle.rst M Lib/idlelib/config.py M Lib/idlelib/help.html M Lib/idlelib/iomenu.py M Lib/idlelib/macosx.py diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index d019bf42cd32..384d2bf57dc5 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 0eb90fc8dc5f..79d988f9a186 100644 --- a/Lib/idlelib/config.py +++ b/Lib/idlelib/config.py @@ -562,12 +562,11 @@ def GetCurrentKeySet(self): 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('<Alt-', '<Option-') for x in v ] if v != v2: diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index a8afc75c316c..e2bf773478e8 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -108,7 +108,7 @@ <h3>Navigation</h3> <p>IDLE has the following features:</p> <ul class="simple"> <li>coded in 100% pure Python, using the <a class="reference internal" href="tkinter.html#module-tkinter" title="tkinter: Interface to Tcl/Tk for graphical user interfaces"><code class="xref py py-mod docutils literal notranslate"><span class="pre">tkinter</span></code></a> GUI toolkit</li> -<li>cross-platform: works mostly the same on Windows, Unix, and Mac OS X</li> +<li>cross-platform: works mostly the same on Windows, Unix, and macOS</li> <li>Python shell window (interactive interpreter) with colorizing of code input, output, and error messages</li> <li>multi-window text editor with multiple undo, Python colorizing, @@ -128,7 +128,7 @@ <h2>Menus<a class="headerlink" href="#menus" title="Permalink to this headline"> <p>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.</p> -<p>On MacOS, there is one application menu. It dynamically changes according +<p>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.</p> <div class="section" id="file-menu-shell-and-editor"> @@ -304,7 +304,7 @@ <h3>Options menu (Shell and Editor)<a class="headerlink" href="#options-menu-she <dt>Configure IDLE</dt> <dd><p class="first">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.</p> @@ -349,7 +349,7 @@ <h3>Help menu (Shell and Editor)<a class="headerlink" href="#help-menu-shell-and </div> <div class="section" id="context-menus"> <span id="index-4"></span><h3>Context Menus<a class="headerlink" href="#context-menus" title="Permalink to this headline">¶</a></h3> -<p>Open a context menu by right-clicking in a window (Control-click on OS X). +<p>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.</p> <dl class="docutils"> <dt>Cut</dt> @@ -399,7 +399,7 @@ <h3>Editor windows<a class="headerlink" href="#editor-windows" title="Permalink <div class="section" id="key-bindings"> <h3>Key bindings<a class="headerlink" href="#key-bindings" title="Permalink to this headline">¶</a></h3> <p>In this section, ‘C’ refers to the <kbd class="kbd docutils literal notranslate">Control</kbd> key on Windows and Unix and -the <kbd class="kbd docutils literal notranslate">Command</kbd> key on Mac OSX.</p> +the <kbd class="kbd docutils literal notranslate">Command</kbd> key on macOS.</p> <ul> <li><p class="first"><kbd class="kbd docutils literal notranslate">Backspace</kbd> deletes to the left; <kbd class="kbd docutils literal notranslate">Del</kbd> deletes to the right</p> </li> @@ -521,8 +521,8 @@ <h3>Python Shell window<a class="headerlink" href="#python-shell-window" title=" <p>Command history</p> <ul class="simple"> <li><kbd class="kbd docutils literal notranslate">Alt-p</kbd> retrieves previous command matching what you have typed. On -OS X use <kbd class="kbd docutils literal notranslate">C-p</kbd>.</li> -<li><kbd class="kbd docutils literal notranslate">Alt-n</kbd> retrieves next. On OS X use <kbd class="kbd docutils literal notranslate">C-n</kbd>.</li> +macOS use <kbd class="kbd docutils literal notranslate">C-p</kbd>.</li> +<li><kbd class="kbd docutils literal notranslate">Alt-n</kbd> retrieves next. On macOS use <kbd class="kbd docutils literal notranslate">C-n</kbd>.</li> <li><kbd class="kbd docutils literal notranslate">Return</kbd> while on any previous command retrieves that command</li> </ul> </li> @@ -757,7 +757,7 @@ <h3>Setting preferences<a class="headerlink" href="#setting-preferences" title=" custom key set in the Configure IDLE dialog under the keys tab.</p> </div> <div class="section" id="idle-on-macos"> -<h3>IDLE on MacOS<a class="headerlink" href="#idle-on-macos" title="Permalink to this headline">¶</a></h3> +<h3>IDLE on macOS<a class="headerlink" href="#idle-on-macos" title="Permalink to this headline">¶</a></h3> <p>Under System Preferences: Dock, one can set “Prefer tabs when opening documents” to “Always”. This setting is not compatible with the tk/tkinter GUI framework used by IDLE, and it breaks a few IDLE features.</p> @@ -817,7 +817,7 @@ <h3><a href="../contents.html">Table of Contents</a></h3> <li><a class="reference internal" href="#help-and-preferences">Help and preferences</a><ul> <li><a class="reference internal" href="#help-sources">Help sources</a></li> <li><a class="reference internal" href="#setting-preferences">Setting preferences</a></li> -<li><a class="reference internal" href="#idle-on-macos">IDLE on MacOS</a></li> +<li><a class="reference internal" href="#idle-on-macos">IDLE on macOS</a></li> <li><a class="reference internal" href="#extensions">Extensions</a></li> </ul> </li> @@ -899,7 +899,7 @@ <h3>Navigation</h3> <br /> <br /> - Last updated on Nov 10, 2018. + Last updated on Nov 12, 2018. <a href="https://docs.python.org/3/bugs.html">Found a bug</a>? <br /> diff --git a/Lib/idlelib/iomenu.py b/Lib/idlelib/iomenu.py index fcd8dcc1393d..f5bced597aa8 100644 --- a/Lib/idlelib/iomenu.py +++ b/Lib/idlelib/iomenu.py @@ -41,7 +41,7 @@ # these problems, falling back to ASCII locale_encoding = locale.nl_langinfo(locale.CODESET) if locale_encoding is None or locale_encoding == '': - # situation occurs on Mac OS X + # situation occurs on macOS locale_encoding = 'ascii' codecs.lookup(locale_encoding) except (NameError, AttributeError, LookupError): @@ -51,7 +51,7 @@ try: locale_encoding = locale.getdefaultlocale()[1] if locale_encoding is None or locale_encoding == '': - # situation occurs on Mac OS X + # situation occurs on macOS locale_encoding = 'ascii' codecs.lookup(locale_encoding) except (ValueError, LookupError): diff --git a/Lib/idlelib/macosx.py b/Lib/idlelib/macosx.py index d3ae224100cf..8f8484a37015 100644 --- a/Lib/idlelib/macosx.py +++ b/Lib/idlelib/macosx.py @@ -1,5 +1,5 @@ """ -A number of functions that enhance IDLE on Mac OSX. +A number of functions that enhance IDLE on macOS. """ from sys import platform # Used in _init_tk_type, changed by test. @@ -192,7 +192,7 @@ def help_dialog(event=None): root.bind('<<close-all-windows>>', flist.close_all_callback) # The binding above doesn't reliably work on all versions of Tk - # on MacOSX. Adding command definition below does seem to do the + # on macOS. Adding command definition below does seem to do the # right thing for now. root.createcommand('exit', flist.close_all_callback) diff --git a/Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst b/Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst new file mode 100644 index 000000000000..9d0e4e1220bb --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst @@ -0,0 +1 @@ +Where appropriate, use 'macOS' in idlelib.

1 0

bpo-35213: Where appropriate, use 'macOS' in idlelib. (#10478)
by Terry Jan Reedy 15 Nov '18

15 Nov '18

https://github.com/python/cpython/commit/b65413b497a07f521d835b799be7dd0afc… commit: b65413b497a07f521d835b799be7dd0afcedbd65 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2018-11-15T13:15:13-05:00 summary: bpo-35213: Where appropriate, use 'macOS' in idlelib. (#10478) files: A Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst M Doc/library/idle.rst M Lib/idlelib/config.py M Lib/idlelib/help.html M Lib/idlelib/iomenu.py M Lib/idlelib/macosx.py diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index d019bf42cd32..384d2bf57dc5 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 0eb90fc8dc5f..79d988f9a186 100644 --- a/Lib/idlelib/config.py +++ b/Lib/idlelib/config.py @@ -562,12 +562,11 @@ def GetCurrentKeySet(self): 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('<Alt-', '<Option-') for x in v ] if v != v2: diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index a8afc75c316c..e2bf773478e8 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -108,7 +108,7 @@ <h3>Navigation</h3> <p>IDLE has the following features:</p> <ul class="simple"> <li>coded in 100% pure Python, using the <a class="reference internal" href="tkinter.html#module-tkinter" title="tkinter: Interface to Tcl/Tk for graphical user interfaces"><code class="xref py py-mod docutils literal notranslate"><span class="pre">tkinter</span></code></a> GUI toolkit</li> -<li>cross-platform: works mostly the same on Windows, Unix, and Mac OS X</li> +<li>cross-platform: works mostly the same on Windows, Unix, and macOS</li> <li>Python shell window (interactive interpreter) with colorizing of code input, output, and error messages</li> <li>multi-window text editor with multiple undo, Python colorizing, @@ -128,7 +128,7 @@ <h2>Menus<a class="headerlink" href="#menus" title="Permalink to this headline"> <p>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.</p> -<p>On MacOS, there is one application menu. It dynamically changes according +<p>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.</p> <div class="section" id="file-menu-shell-and-editor"> @@ -304,7 +304,7 @@ <h3>Options menu (Shell and Editor)<a class="headerlink" href="#options-menu-she <dt>Configure IDLE</dt> <dd><p class="first">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.</p> @@ -349,7 +349,7 @@ <h3>Help menu (Shell and Editor)<a class="headerlink" href="#help-menu-shell-and </div> <div class="section" id="context-menus"> <span id="index-4"></span><h3>Context Menus<a class="headerlink" href="#context-menus" title="Permalink to this headline">¶</a></h3> -<p>Open a context menu by right-clicking in a window (Control-click on OS X). +<p>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.</p> <dl class="docutils"> <dt>Cut</dt> @@ -399,7 +399,7 @@ <h3>Editor windows<a class="headerlink" href="#editor-windows" title="Permalink <div class="section" id="key-bindings"> <h3>Key bindings<a class="headerlink" href="#key-bindings" title="Permalink to this headline">¶</a></h3> <p>In this section, ‘C’ refers to the <kbd class="kbd docutils literal notranslate">Control</kbd> key on Windows and Unix and -the <kbd class="kbd docutils literal notranslate">Command</kbd> key on Mac OSX.</p> +the <kbd class="kbd docutils literal notranslate">Command</kbd> key on macOS.</p> <ul> <li><p class="first"><kbd class="kbd docutils literal notranslate">Backspace</kbd> deletes to the left; <kbd class="kbd docutils literal notranslate">Del</kbd> deletes to the right</p> </li> @@ -521,8 +521,8 @@ <h3>Python Shell window<a class="headerlink" href="#python-shell-window" title=" <p>Command history</p> <ul class="simple"> <li><kbd class="kbd docutils literal notranslate">Alt-p</kbd> retrieves previous command matching what you have typed. On -OS X use <kbd class="kbd docutils literal notranslate">C-p</kbd>.</li> -<li><kbd class="kbd docutils literal notranslate">Alt-n</kbd> retrieves next. On OS X use <kbd class="kbd docutils literal notranslate">C-n</kbd>.</li> +macOS use <kbd class="kbd docutils literal notranslate">C-p</kbd>.</li> +<li><kbd class="kbd docutils literal notranslate">Alt-n</kbd> retrieves next. On macOS use <kbd class="kbd docutils literal notranslate">C-n</kbd>.</li> <li><kbd class="kbd docutils literal notranslate">Return</kbd> while on any previous command retrieves that command</li> </ul> </li> @@ -757,7 +757,7 @@ <h3>Setting preferences<a class="headerlink" href="#setting-preferences" title=" custom key set in the Configure IDLE dialog under the keys tab.</p> </div> <div class="section" id="idle-on-macos"> -<h3>IDLE on MacOS<a class="headerlink" href="#idle-on-macos" title="Permalink to this headline">¶</a></h3> +<h3>IDLE on macOS<a class="headerlink" href="#idle-on-macos" title="Permalink to this headline">¶</a></h3> <p>Under System Preferences: Dock, one can set “Prefer tabs when opening documents” to “Always”. This setting is not compatible with the tk/tkinter GUI framework used by IDLE, and it breaks a few IDLE features.</p> @@ -817,7 +817,7 @@ <h3><a href="../contents.html">Table of Contents</a></h3> <li><a class="reference internal" href="#help-and-preferences">Help and preferences</a><ul> <li><a class="reference internal" href="#help-sources">Help sources</a></li> <li><a class="reference internal" href="#setting-preferences">Setting preferences</a></li> -<li><a class="reference internal" href="#idle-on-macos">IDLE on MacOS</a></li> +<li><a class="reference internal" href="#idle-on-macos">IDLE on macOS</a></li> <li><a class="reference internal" href="#extensions">Extensions</a></li> </ul> </li> @@ -899,7 +899,7 @@ <h3>Navigation</h3> <br /> <br /> - Last updated on Nov 10, 2018. + Last updated on Nov 12, 2018. <a href="https://docs.python.org/3/bugs.html">Found a bug</a>? <br /> diff --git a/Lib/idlelib/iomenu.py b/Lib/idlelib/iomenu.py index fcd8dcc1393d..f5bced597aa8 100644 --- a/Lib/idlelib/iomenu.py +++ b/Lib/idlelib/iomenu.py @@ -41,7 +41,7 @@ # these problems, falling back to ASCII locale_encoding = locale.nl_langinfo(locale.CODESET) if locale_encoding is None or locale_encoding == '': - # situation occurs on Mac OS X + # situation occurs on macOS locale_encoding = 'ascii' codecs.lookup(locale_encoding) except (NameError, AttributeError, LookupError): @@ -51,7 +51,7 @@ try: locale_encoding = locale.getdefaultlocale()[1] if locale_encoding is None or locale_encoding == '': - # situation occurs on Mac OS X + # situation occurs on macOS locale_encoding = 'ascii' codecs.lookup(locale_encoding) except (ValueError, LookupError): diff --git a/Lib/idlelib/macosx.py b/Lib/idlelib/macosx.py index d3ae224100cf..8f8484a37015 100644 --- a/Lib/idlelib/macosx.py +++ b/Lib/idlelib/macosx.py @@ -1,5 +1,5 @@ """ -A number of functions that enhance IDLE on Mac OSX. +A number of functions that enhance IDLE on macOS. """ from sys import platform # Used in _init_tk_type, changed by test. @@ -192,7 +192,7 @@ def help_dialog(event=None): root.bind('<<close-all-windows>>', flist.close_all_callback) # The binding above doesn't reliably work on all versions of Tk - # on MacOSX. Adding command definition below does seem to do the + # on macOS. Adding command definition below does seem to do the # right thing for now. root.createcommand('exit', flist.close_all_callback) diff --git a/Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst b/Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst new file mode 100644 index 000000000000..9d0e4e1220bb --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-11-12-00-20-01.bpo-35213.cqNgzT.rst @@ -0,0 +1 @@ +Where appropriate, use 'macOS' in idlelib.

1 0

bpo-35202: Remove unused imports in Lib directory (GH-10450)
by INADA Naoki 15 Nov '18

15 Nov '18

https://github.com/python/cpython/commit/70f61b933f5f4bbb28d2c1a2ebf3a55551… commit: 70f61b933f5f4bbb28d2c1a2ebf3a555513e67b0 branch: master author: Srinivas Thatiparthy (శ్రీనివాస్ తాటిపర్తి) <thatiparthysreenivas(a)gmail.com> committer: INADA Naoki <methane(a)users.noreply.github.com> date: 2018-11-15T21:59:19+09:00 summary: bpo-35202: Remove unused imports in Lib directory (GH-10450) files: M Lib/asyncio/base_events.py M Lib/test/_test_multiprocessing.py M Lib/test/test_contextlib.py M Lib/test/test_regrtest.py M Lib/test/test_uuid.py diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index 3726c556d4f0..f5ab6e7b2d21 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -18,7 +18,6 @@ import concurrent.futures import heapq import itertools -import logging import os import socket import subprocess diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index 7993fcb08e46..4302708c14f1 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -5,7 +5,6 @@ import unittest import unittest.mock import queue as pyqueue -import contextlib import time import io import itertools diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py index 2a44404a603e..755d9b95a677 100644 --- a/Lib/test/test_contextlib.py +++ b/Lib/test/test_contextlib.py @@ -1,6 +1,5 @@ """Unit tests for contextlib.py, and other context managers.""" -import asyncio import io import sys import tempfile diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index f923311f3f20..8c5238066244 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -15,7 +15,6 @@ import sysconfig import tempfile import textwrap -import threading import unittest from test import libregrtest from test import support diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py index c1b35c4a7f6c..dc502b97ca4e 100644 --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -3,7 +3,6 @@ import builtins import contextlib import copy -from functools import partial import io import os import pickle

1 0

Fix a possible reference leak in _socket.getaddrinfo(). (GH-10543)
by Miss Islington (bot) 15 Nov '18

15 Nov '18

https://github.com/python/cpython/commit/2907d93889b67cda4041c4cb716521ee70… commit: 2907d93889b67cda4041c4cb716521ee70af3703 branch: 2.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-15T01:25:58-08:00 summary: Fix a possible reference leak in _socket.getaddrinfo(). (GH-10543) "single" needs to be decrefed if PyList_Append() fails. (cherry picked from commit 4c596d54aa6a55e9d2a3db78891e656ebbfb63c8) Co-authored-by: Zackery Spytz <zspytz(a)gmail.com> files: M Modules/socketmodule.c diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 634c1b90778b..013975455c45 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -4249,9 +4249,11 @@ socket_getaddrinfo(PyObject *self, PyObject *args) if (single == NULL) goto err; - if (PyList_Append(all, single)) + if (PyList_Append(all, single)) { + Py_DECREF(single); goto err; - Py_XDECREF(single); + } + Py_DECREF(single); } Py_XDECREF(idna); if (res0)

1 0

Fix a possible reference leak in _socket.getaddrinfo(). (GH-10543)
by Miss Islington (bot) 15 Nov '18

15 Nov '18

https://github.com/python/cpython/commit/2b6e77e778bc6f5b69384d6c13cb2015c1… commit: 2b6e77e778bc6f5b69384d6c13cb2015c13fc81e branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-15T01:25:46-08:00 summary: Fix a possible reference leak in _socket.getaddrinfo(). (GH-10543) "single" needs to be decrefed if PyList_Append() fails. (cherry picked from commit 4c596d54aa6a55e9d2a3db78891e656ebbfb63c8) Co-authored-by: Zackery Spytz <zspytz(a)gmail.com> files: M Modules/socketmodule.c diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index ed3166740278..c940f1b81693 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -6075,9 +6075,11 @@ socket_getaddrinfo(PyObject *self, PyObject *args, PyObject* kwargs) if (single == NULL) goto err; - if (PyList_Append(all, single)) + if (PyList_Append(all, single)) { + Py_DECREF(single); goto err; - Py_XDECREF(single); + } + Py_DECREF(single); } Py_XDECREF(idna); if (res0)

1 0

Fix a possible reference leak in _socket.getaddrinfo(). (GH-10543)
by Miss Islington (bot) 15 Nov '18

15 Nov '18

https://github.com/python/cpython/commit/b5ea5e57f5dd23e1db695dda8bf3f6142e… commit: b5ea5e57f5dd23e1db695dda8bf3f6142ed9074f branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-15T01:25:34-08:00 summary: Fix a possible reference leak in _socket.getaddrinfo(). (GH-10543) "single" needs to be decrefed if PyList_Append() fails. (cherry picked from commit 4c596d54aa6a55e9d2a3db78891e656ebbfb63c8) Co-authored-by: Zackery Spytz <zspytz(a)gmail.com> files: M Modules/socketmodule.c diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index eeade2ecad64..ddb1c4364b91 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -6269,9 +6269,11 @@ socket_getaddrinfo(PyObject *self, PyObject *args, PyObject* kwargs) if (single == NULL) goto err; - if (PyList_Append(all, single)) + if (PyList_Append(all, single)) { + Py_DECREF(single); goto err; - Py_XDECREF(single); + } + Py_DECREF(single); } Py_XDECREF(idna); if (res0)

1 0