From 766a4f097aaa0a16268a522e07a23d1ac9d60a3a Mon Sep 17 00:00:00 2001 From: ergenekonyigit Date: Mon, 13 Feb 2017 03:41:32 +0300 Subject: [PATCH 1/9] Renamed whole Mac OS X's to macOS --- Doc/c-api/init.rst | 6 +- Doc/distributing/index.rst | 2 +- Doc/distutils/apiref.rst | 8 +- Doc/distutils/builtdist.rst | 2 +- Doc/distutils/setupscript.rst | 2 +- Doc/extending/extending.rst | 2 +- Doc/faq/gui.rst | 6 +- Doc/faq/installed.rst | 2 +- Doc/howto/unicode.rst | 2 +- Doc/install/index.rst | 10 +- Doc/installing/index.rst | 6 +- Doc/library/asyncio-eventloops.rst | 10 +- Doc/library/asyncio-protocol.rst | 2 +- Doc/library/ctypes.rst | 6 +- Doc/library/idle.rst | 12 +- Doc/library/macpath.rst | 8 +- Doc/library/mmap.rst | 2 +- Doc/library/multiprocessing.rst | 6 +- Doc/library/os.path.rst | 2 +- Doc/library/os.rst | 16 +- Doc/library/othergui.rst | 6 +- Doc/library/platform.rst | 6 +- Doc/library/plistlib.rst | 6 +- Doc/library/profile.rst | 2 +- Doc/library/readline.rst | 2 +- Doc/library/select.rst | 4 +- Doc/library/shutil.rst | 2 +- Doc/library/site.rst | 4 +- Doc/library/sqlite3.rst | 2 +- Doc/library/ssl.rst | 2 +- Doc/library/stat.rst | 6 +- Doc/library/sys.rst | 4 +- Doc/library/sysconfig.rst | 4 +- Doc/library/tkinter.ttk.rst | 2 +- Doc/library/urllib.request.rst | 8 +- Doc/library/webbrowser.rst | 6 +- Doc/license.rst | 2 +- Doc/tutorial/appetite.rst | 2 +- Doc/using/cmdline.rst | 4 +- Doc/using/mac.rst | 16 +- Doc/whatsnew/2.0.rst | 2 +- Doc/whatsnew/2.1.rst | 2 +- Doc/whatsnew/2.2.rst | 6 +- Doc/whatsnew/2.5.rst | 4 +- Doc/whatsnew/2.6.rst | 14 +- Doc/whatsnew/2.7.rst | 2 +- Doc/whatsnew/3.0.rst | 4 +- Doc/whatsnew/3.2.rst | 8 +- Doc/whatsnew/3.3.rst | 2 +- Doc/whatsnew/3.4.rst | 2 +- Doc/whatsnew/3.5.rst | 2 +- Include/py_curses.h | 4 +- Include/pymacconfig.h | 4 +- Lib/_osx_support.py | 6 +- Lib/asyncio/unix_events.py | 2 +- Lib/concurrent/futures/process.py | 2 +- Lib/ctypes/__init__.py | 4 +- Lib/ctypes/test/test_cfuncs.py | 2 +- Lib/distutils/command/bdist.py | 2 +- Lib/distutils/dist.py | 2 +- Lib/distutils/file_util.py | 2 +- Lib/distutils/filelist.py | 2 +- Lib/distutils/sysconfig.py | 6 +- Lib/distutils/tests/support.py | 2 +- Lib/distutils/tests/test_bdist_rpm.py | 8 +- Lib/distutils/tests/test_build_ext.py | 6 +- Lib/distutils/tests/test_sysconfig.py | 2 +- Lib/distutils/tests/test_unixccompiler.py | 4 +- Lib/distutils/unixccompiler.py | 2 +- Lib/distutils/util.py | 4 +- Lib/encodings/mac_greek.py | 4 +- Lib/idlelib/NEWS.txt | 16 +- Lib/idlelib/NEWS2x.txt | 6 +- Lib/idlelib/config.py | 4 +- Lib/idlelib/editor.py | 4 +- Lib/idlelib/help.html | 12 +- Lib/idlelib/idle_test/README.txt | 2 +- Lib/idlelib/iomenu.py | 4 +- Lib/idlelib/macosx.py | 20 +- Lib/idlelib/mainmenu.py | 2 +- Lib/idlelib/pyshell.py | 2 +- Lib/idlelib/runscript.py | 2 +- Lib/mimetypes.py | 2 +- Lib/multiprocessing/process.py | 2 +- Lib/multiprocessing/queues.py | 2 +- Lib/multiprocessing/reduction.py | 2 +- Lib/os.py | 4 +- Lib/platform.py | 2 +- Lib/plistlib.py | 4 +- Lib/site.py | 4 +- Lib/stat.py | 4 +- Lib/sysconfig.py | 4 +- Lib/test/eintrdata/eintr_tester.py | 4 +- Lib/test/libregrtest/cmdline.py | 2 +- Lib/test/libregrtest/setup.py | 2 +- Lib/test/math_testcases.txt | 2 +- Lib/test/support/__init__.py | 18 +- Lib/test/test__locale.py | 4 +- Lib/test/test__osx_support.py | 4 +- Lib/test/test_asyncio/test_events.py | 16 +- Lib/test/test_cmath.py | 4 +- Lib/test/test_cmd_line.py | 6 +- Lib/test/test_cmd_line_script.py | 2 +- Lib/test/test_email/test_utils.py | 2 +- Lib/test/test_faulthandler.py | 2 +- Lib/test/test_genericpath.py | 2 +- Lib/test/test_httpservers.py | 2 +- Lib/test/test_imp.py | 2 +- Lib/test/test_importlib/util.py | 2 +- Lib/test/test_io.py | 2 +- Lib/test/test_largefile.py | 2 +- Lib/test/test_locale.py | 2 +- Lib/test/test_math.py | 6 +- Lib/test/test_mmap.py | 2 +- Lib/test/test_os.py | 4 +- Lib/test/test_osx_env.py | 2 +- Lib/test/test_platform.py | 2 +- Lib/test/test_posix.py | 2 +- Lib/test/test_readline.py | 4 +- Lib/test/test_selectors.py | 2 +- Lib/test/test_site.py | 4 +- Lib/test/test_socket.py | 6 +- Lib/test/test_subprocess.py | 6 +- Lib/test/test_sysconfig.py | 2 +- Lib/test/test_threading.py | 2 +- Lib/test/test_unicode_file_functions.py | 6 +- Lib/tkinter/test/test_ttk/test_widgets.py | 2 +- Lib/turtle.py | 2 +- Lib/turtledemo/__main__.py | 2 +- Lib/unittest/main.py | 2 +- Lib/urllib/request.py | 4 +- Lib/uuid.py | 4 +- Lib/venv/__init__.py | 2 +- Lib/webbrowser.py | 6 +- Lib/xmlrpc/client.py | 2 +- Mac/BuildScript/README.txt | 34 +- Mac/BuildScript/build-installer.py | 32 +- .../issue19373_tk_8_5_15_source.patch | 2 +- Mac/BuildScript/openssl_sdk_makedepend.patch | 4 +- Mac/BuildScript/resources/ReadMe.rtf | 8 +- Mac/BuildScript/resources/Welcome.rtf | 8 +- Mac/Icons/ReadMe.txt | 2 +- Mac/README | 68 ++-- Makefile.pre.in | 12 +- Misc/HISTORY | 306 +++++++++--------- Misc/NEWS | 96 +++--- Modules/_ctypes/darwin/README | 2 +- Modules/_ctypes/darwin/dlfcn.h | 2 +- Modules/_ctypes/darwin/dlfcn_simple.c | 2 +- Modules/_ctypes/libffi_osx/include/ffi.h | 2 +- .../_ctypes/libffi_osx/include/fficonfig.h | 2 +- .../_ctypes/libffi_osx/powerpc/ppc-darwin.S | 4 +- Modules/_decimal/README.txt | 2 +- Modules/_multiprocessing/semaphore.c | 2 +- Modules/_posixsubprocess.c | 2 +- Modules/_sha3/kcp/align.h | 2 +- Modules/_stat.c | 4 +- Modules/cmathmodule.c | 2 +- Modules/errnomodule.c | 6 +- Modules/fcntlmodule.c | 2 +- Modules/getpath.c | 4 +- Modules/main.c | 4 +- Modules/mmapmodule.c | 2 +- Modules/posixmodule.c | 14 +- Modules/socketmodule.c | 8 +- Modules/zlib/ChangeLog | 10 +- Modules/zlib/configure | 2 +- Objects/unicodeobject.c | 2 +- Python/dynload_next.c | 2 +- README.rst | 2 +- Tools/stringbench/stringbench.py | 2 +- config.guess | 4 +- configure | 40 +-- configure.ac | 38 +-- setup.py | 20 +- 175 files changed, 672 insertions(+), 672 deletions(-) diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst index 7d9eefb1ead2bc..fa6df17df6b8aa 100644 --- a/Doc/c-api/init.rst +++ b/Doc/c-api/init.rst @@ -232,7 +232,7 @@ Process-wide parameters (set by :c:func:`Py_SetProgramName` above) and some environment variables. The returned string consists of a series of directory names separated by a platform dependent delimiter character. The delimiter character is ``':'`` - on Unix and Mac OS X, ``';'`` on Windows. The returned string points into + on Unix and macOS, ``';'`` on Windows. The returned string points into static storage; the caller should not modify its value. The list :data:`sys.path` is initialized with this value on interpreter startup; it can be (and usually is) modified later to change the search path for loading @@ -253,7 +253,7 @@ Process-wide parameters default search path but uses the one provided instead. This is useful if Python is embedded by an application that has full knowledge of the location of all modules. The path components should be separated by the platform - dependent delimiter character, which is ``':'`` on Unix and Mac OS X, ``';'`` + dependent delimiter character, which is ``':'`` on Unix and macOS, ``';'`` on Windows. This also causes :data:`sys.executable` to be set only to the raw program @@ -290,7 +290,7 @@ Process-wide parameters Return the platform identifier for the current platform. On Unix, this is formed from the "official" name of the operating system, converted to lower case, followed by the major revision number; e.g., for Solaris 2.x, which is - also known as SunOS 5.x, the value is ``'sunos5'``. On Mac OS X, it is + also known as SunOS 5.x, the value is ``'sunos5'``. On macOS, it is ``'darwin'``. On Windows, it is ``'win'``. The returned string points into static storage; the caller should not modify its value. The value is available to Python code as ``sys.platform``. diff --git a/Doc/distributing/index.rst b/Doc/distributing/index.rst index 82ecd2c1ef45fb..0c1a72d2066e93 100644 --- a/Doc/distributing/index.rst +++ b/Doc/distributing/index.rst @@ -101,7 +101,7 @@ by invoking the ``pip`` module at the command line:: .. note:: - For POSIX users (including Mac OS X and Linux users), these instructions + For POSIX users (including macOS and Linux users), these instructions assume the use of a :term:`virtual environment`. For Windows users, these instructions assume that the option to diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index b5b7731074c2ca..f3ecea3846b052 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -353,7 +353,7 @@ This module provides the following functions. compiler object under Unix---if you supply a value for *compiler*, *plat* is ignored. - .. % Is the posix/nt only thing still true? Mac OS X seems to work, and + .. % Is the posix/nt only thing still true? macOS seems to work, and .. % returns a UnixCCompiler instance. How to document this... hmm. @@ -1102,11 +1102,11 @@ other utility module. For non-POSIX platforms, currently just returns ``sys.platform``. - For Mac OS X systems the OS version reflects the minimal version on which + For macOS systems the OS version reflects the minimal version on which binaries will run (that is, the value of ``MACOSX_DEPLOYMENT_TARGET`` during the build of Python), not the OS version of the current system. - For universal binary builds on Mac OS X the architecture value reflects + For universal binary builds on macOS the architecture value reflects the universal binary status instead of the architecture of the current processor. For 32-bit universal binaries the architecture is ``fat``, for 64-bit universal binaries the architecture is ``fat64``, and @@ -1115,7 +1115,7 @@ other utility module. a 3-way universal build (ppc, i386, x86_64) and ``intel`` is used for a universal build with the i386 and x86_64 architectures - Examples of returned values on Mac OS X: + Examples of returned values on macOS: * ``macosx-10.3-ppc`` diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst index bbd2a8ce831cee..679be5a6ba5c33 100644 --- a/Doc/distutils/builtdist.rst +++ b/Doc/distutils/builtdist.rst @@ -314,7 +314,7 @@ or the :command:`bdist` command with the :option:`!--formats` option:: If you have a pure module distribution (only containing pure Python modules and packages), the resulting installer will be version independent and have a name like :file:`foo-1.0.win32.exe`. These installers can even be created on Unix -platforms or Mac OS X. +platforms or macOS. If you have a non-pure distribution, the extensions can only be created on a Windows platform, and will be Python version dependent. The installer filename diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index 38e0202e4ac1f6..4348f5f2dd0539 100644 --- a/Doc/distutils/setupscript.rst +++ b/Doc/distutils/setupscript.rst @@ -661,7 +661,7 @@ information is sometimes used to indicate sub-releases. These are 'Intended Audience :: Developers', 'Intended Audience :: System Administrators', 'License :: OSI Approved :: Python Software Foundation License', - 'Operating System :: MacOS :: MacOS X', + 'Operating System :: macOS :: macOS', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', 'Programming Language :: Python', diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst index 4ac820a432b9b0..b8a201a150af09 100644 --- a/Doc/extending/extending.rst +++ b/Doc/extending/extending.rst @@ -887,7 +887,7 @@ The :mod:`gc` module exposes a way to run the detector (the interfaces and the ability to disable the detector at runtime. The cycle detector is considered an optional component; though it is included by default, it can be disabled at build time using the :option:`!--without-cycle-gc` option -to the :program:`configure` script on Unix platforms (including Mac OS X). If +to the :program:`configure` script on Unix platforms (including macOS). If the cycle detector is disabled in this way, the :mod:`gc` module will not be available. diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst index 477d8c633438d1..9a00fc9ae4270f 100644 --- a/Doc/faq/gui.rst +++ b/Doc/faq/gui.rst @@ -32,14 +32,14 @@ install (since it comes included with most `binary distributions `_ of Python) and use. For more info about Tk, including pointers to the source, see the `Tcl/Tk home page `_. Tcl/Tk is fully portable to the -Mac OS X, Windows, and Unix platforms. +macOS, Windows, and Unix platforms. wxWidgets --------- wxWidgets (https://www.wxwidgets.org) is a free, portable GUI class library written in C++ that provides a native look and feel on a -number of platforms, with Windows, Mac OS X, GTK, X11, all listed as +number of platforms, with Windows, macOS, GTK, X11, all listed as current stable targets. Language bindings are available for a number of languages including Python, Perl, Ruby, etc. @@ -113,7 +113,7 @@ What platform-specific GUI toolkits exist for Python? ======================================================== By installing the `PyObjc Objective-C bridge -`_, Python programs can use Mac OS X's +`_, Python programs can use macOS's Cocoa libraries. :ref:`Pythonwin ` by Mark Hammond includes an interface to the diff --git a/Doc/faq/installed.rst b/Doc/faq/installed.rst index 42296533e26f32..16c9a74daffb1d 100644 --- a/Doc/faq/installed.rst +++ b/Doc/faq/installed.rst @@ -29,7 +29,7 @@ there are several possible ways it could have gotten there. * Some Windows machines also have Python installed. At this writing we're aware of computers from Hewlett-Packard and Compaq that include Python. Apparently some of HP/Compaq's administrative tools are written in Python. -* Many Unix-compatible operating systems, such as Mac OS X and some Linux +* Many Unix-compatible operating systems, such as macOS and some Linux distributions, have Python installed by default; it's included in the base installation. diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst index a48ae1f5faba7e..1a7988c4b02a44 100644 --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -576,7 +576,7 @@ Unicode filenames Most of the operating systems in common use today support filenames that contain arbitrary Unicode characters. Usually this is implemented by converting the Unicode string into some encoding that varies depending on the system. For -example, Mac OS X uses UTF-8 while Windows uses a configurable encoding; on +example, macOS uses UTF-8 while Windows uses a configurable encoding; on Windows, Python uses the name "mbcs" to refer to whatever the currently configured encoding is. On Unix systems, there will only be a filesystem encoding if you've set the ``LANG`` or ``LC_CTYPE`` environment variables; if diff --git a/Doc/install/index.rst b/Doc/install/index.rst index bc080b00c59a82..19c3c4644b3244 100644 --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -245,7 +245,7 @@ directory. If you don't choose an installation directory---i.e., if you just run ``setup.py install``\ ---then the :command:`install` command installs to the standard location for third-party Python modules. This location varies by platform and -by how you built/installed Python itself. On Unix (and Mac OS X, which is also +by how you built/installed Python itself. On Unix (and macOS, which is also Unix-based), it also depends on whether the module distribution being installed is pure Python or contains extensions ("non-pure"): @@ -275,7 +275,7 @@ Notes: :file:`{prefix}` and :file:`{exec-prefix}` stand for the directories that Python is installed to, and where it finds its libraries at run-time. They are always -the same under Windows, and very often the same under Unix and Mac OS X. You +the same under Windows, and very often the same under Unix and macOS. You can find out what your Python installation uses for :file:`{prefix}` and :file:`{exec-prefix}` by running Python in interactive mode and typing a few simple commands. Under Unix, just type ``python`` at the shell prompt. Under @@ -349,7 +349,7 @@ install into it. It is enabled with a simple option:: Files will be installed into subdirectories of :data:`site.USER_BASE` (written as :file:`{userbase}` hereafter). This scheme installs pure Python modules and extension modules in the same location (also known as :data:`site.USER_SITE`). -Here are the values for UNIX, including Mac OS X: +Here are the values for UNIX, including macOS: =============== =========================================================== Type of file Installation directory @@ -655,7 +655,7 @@ bear a strong resemblance to environment variables. In fact, you can use environment variables in config files on platforms that have such a notion but the Distutils additionally define a few extra variables that may not be in your environment, such as ``$PLAT``. (And of course, on systems that don't have -environment variables, such as Mac OS 9, the configuration variables supplied by +environment variables, such as macOS 9, the configuration variables supplied by the Distutils are the only ones you can use.) See section :ref:`inst-config-files` for details. @@ -766,7 +766,7 @@ Location and names of config files ---------------------------------- The names and locations of the configuration files vary slightly across -platforms. On Unix and Mac OS X, the three configuration files (in the order +platforms. On Unix and macOS, the three configuration files (in the order they are processed) are: +--------------+----------------------------------------------------------+-------+ diff --git a/Doc/installing/index.rst b/Doc/installing/index.rst index b22465df2910eb..67d732e304d034 100644 --- a/Doc/installing/index.rst +++ b/Doc/installing/index.rst @@ -89,7 +89,7 @@ dependencies from the Python Packaging Index:: .. note:: - For POSIX users (including Mac OS X and Linux users), the examples in + For POSIX users (including macOS and Linux users), the examples in this guide assume the use of a :term:`virtual environment`. For Windows users, the examples in this guide assume that the option to @@ -168,7 +168,7 @@ rather than attempting to install them with ``pip``. ... work with multiple versions of Python installed in parallel? ---------------------------------------------------------------- -On Linux, Mac OS X, and other POSIX systems, use the versioned Python commands +On Linux, macOS, and other POSIX systems, use the versioned Python commands in combination with the ``-m`` switch to run the appropriate copy of ``pip``:: @@ -219,7 +219,7 @@ users being expected to compile extension modules from source as part of the installation process. With the introduction of support for the binary ``wheel`` format, and the -ability to publish wheels for at least Windows and Mac OS X through the +ability to publish wheels for at least Windows and macOS through the Python Packaging Index, this problem is expected to diminish over time, as users are more regularly able to install pre-built extensions rather than needing to build them themselves. diff --git a/Doc/library/asyncio-eventloops.rst b/Doc/library/asyncio-eventloops.rst index 1dc18fce79d021..cc33b5278c799f 100644 --- a/Doc/library/asyncio-eventloops.rst +++ b/Doc/library/asyncio-eventloops.rst @@ -115,18 +115,18 @@ configuration. See :ref:`asyncio delayed calls `. :class:`ProactorEventLoop` now supports SSL. -Mac OS X +macOS ^^^^^^^^ -Character devices like PTY are only well supported since Mavericks (Mac OS -10.9). They are not supported at all on Mac OS 10.5 and older. +Character devices like PTY are only well supported since Mavericks (macOS +10.9). They are not supported at all on macOS 10.5 and older. -On Mac OS 10.6, 10.7 and 10.8, the default event loop is +On macOS 10.6, 10.7 and 10.8, the default event loop is :class:`SelectorEventLoop` which uses :class:`selectors.KqueueSelector`. :class:`selectors.KqueueSelector` does not support character devices on these versions. The :class:`SelectorEventLoop` can be used with :class:`~selectors.SelectSelector` or :class:`~selectors.PollSelector` to -support character devices on these versions of Mac OS X. Example:: +support character devices on these versions of macOS. Example:: import asyncio import selectors diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst index 3fbf51058673d9..d5bef98a5cead5 100644 --- a/Doc/library/asyncio-protocol.rst +++ b/Doc/library/asyncio-protocol.rst @@ -462,7 +462,7 @@ buffer size reaches the low-water mark. mark is zero. .. note:: - On BSD systems (OS X, FreeBSD, etc.) flow control is not supported + On BSD systems (macOS, FreeBSD, etc.) flow control is not supported for :class:`DatagramProtocol`, because send failures caused by writing too many packets cannot be detected easily. The socket always appears 'ready' and excess packets are dropped; an diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst index 3840935ce04eb6..a31375dbc36737 100644 --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -20,7 +20,7 @@ ctypes tutorial Note: The code samples in this tutorial use :mod:`doctest` to make sure that they actually work. Since some code samples behave differently under Linux, -Windows, or Mac OS X, they contain doctest directives in comments. +Windows, or macOS, they contain doctest directives in comments. Note: Some code samples reference the ctypes :class:`c_int` type. On platforms where ``sizeof(long) == sizeof(int)`` it is an alias to :class:`c_long`. @@ -80,7 +80,7 @@ the library by creating an instance of CDLL by calling the constructor:: >>> -.. XXX Add section for Mac OS X. +.. XXX Add section for macOS. .. _ctypes-accessing-functions-from-loaded-dlls: @@ -1278,7 +1278,7 @@ Here are some examples:: 'libbz2.so.1.0' >>> -On OS X, :func:`find_library` tries several predefined naming schemes and paths +On macOS, :func:`find_library` tries several predefined naming schemes and paths to locate the library, and returns a full pathname if successful:: >>> from ctypes.util import find_library diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index a629bc50dbc749..1c6c362d5bf900 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 @@ -261,7 +261,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. @@ -316,7 +316,7 @@ the General tab. 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 @@ -348,7 +348,7 @@ Editing and navigation ---------------------- 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 @@ -483,9 +483,9 @@ Python Shell window 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 diff --git a/Doc/library/macpath.rst b/Doc/library/macpath.rst index b08bbe08093dab..353436deeb9e4f 100644 --- a/Doc/library/macpath.rst +++ b/Doc/library/macpath.rst @@ -1,15 +1,15 @@ -:mod:`macpath` --- Mac OS 9 path manipulation functions +:mod:`macpath` --- macOS 9 path manipulation functions ======================================================= .. module:: macpath - :synopsis: Mac OS 9 path manipulation functions. + :synopsis: macOS 9 path manipulation functions. **Source code:** :source:`Lib/macpath.py` -------------- -This module is the Mac OS 9 (and earlier) implementation of the :mod:`os.path` -module. It can be used to manipulate old-style Macintosh pathnames on Mac OS X +This module is the macOS 9 (and earlier) implementation of the :mod:`os.path` +module. It can be used to manipulate old-style Macintosh pathnames on macOS (or any other platform). The following functions are available in this module: :func:`normcase`, diff --git a/Doc/library/mmap.rst b/Doc/library/mmap.rst index f46bf66db2ff51..629e41a23bd126 100644 --- a/Doc/library/mmap.rst +++ b/Doc/library/mmap.rst @@ -95,7 +95,7 @@ To map anonymous memory, -1 should be passed as the fileno along with the length To ensure validity of the created memory mapping the file specified by the descriptor *fileno* is internally automatically synchronized - with physical backing store on Mac OS X and OpenVMS. + with physical backing store on macOS and OpenVMS. This example shows a simple way of using :class:`~mmap.mmap`:: diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 96d1424126caed..4a9bc30bcbaa69 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -746,7 +746,7 @@ For an example of the usage of queues for interprocess communication see multithreading/multiprocessing semantics, this number is not reliable. Note that this may raise :exc:`NotImplementedError` on Unix platforms like - Mac OS X where ``sem_getvalue()`` is not implemented. + macOS where ``sem_getvalue()`` is not implemented. .. method:: empty() @@ -1165,7 +1165,7 @@ object -- see :ref:`multiprocessing-managers`. first argument is named *block*, as is consistent with :meth:`Lock.acquire`. .. note:: - On Mac OS X, this is indistinguishable from :class:`Semaphore` because + On macOS, this is indistinguishable from :class:`Semaphore` because ``sem_getvalue()`` is not implemented on that platform. .. class:: Condition([lock]) @@ -1304,7 +1304,7 @@ object -- see :ref:`multiprocessing-managers`. .. note:: - On Mac OS X, ``sem_timedwait`` is unsupported, so calling ``acquire()`` with + On macOS, ``sem_timedwait`` is unsupported, so calling ``acquire()`` with a timeout will emulate that function's behavior using a sleeping loop. .. note:: diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst index 38a93315770d02..3a1cc9ff671d71 100644 --- a/Doc/library/os.path.rst +++ b/Doc/library/os.path.rst @@ -312,7 +312,7 @@ the :mod:`glob` module.) .. function:: normcase(path) - Normalize the case of a pathname. On Unix and Mac OS X, this returns the + Normalize the case of a pathname. On Unix and macOS, this returns the path unchanged; on case-insensitive filesystems, it converts the path to lowercase. On Windows, it also converts forward slashes to backward slashes. Raise a TypeError if the type of *path* is not ``str`` or ``bytes`` (directly diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 37fa2a2868dac9..b36e274ba6ceee 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -37,7 +37,7 @@ Notes on the availability of these functions: operating system. * If not separately noted, all functions that claim "Availability: Unix" are - supported on Mac OS X, which builds on a Unix core. + supported on macOS, which builds on a Unix core. .. Availability notes get their own line and occur at the end of the function .. documentation. @@ -134,7 +134,7 @@ process and user. .. note:: - On some platforms, including FreeBSD and Mac OS X, setting ``environ`` may + On some platforms, including FreeBSD and macOS, setting ``environ`` may cause memory leaks. Refer to the system documentation for :c:func:`putenv`. @@ -307,7 +307,7 @@ process and user. .. note:: - On Mac OS X, :func:`getgroups` behavior differs somewhat from + On macOS, :func:`getgroups` behavior differs somewhat from other Unix platforms. If the Python interpreter was built with a deployment target of :const:`10.5` or earlier, :func:`getgroups` returns the list of effective group ids associated with the current user process; @@ -450,7 +450,7 @@ process and user. .. note:: - On some platforms, including FreeBSD and Mac OS X, setting ``environ`` may + On some platforms, including FreeBSD and macOS, setting ``environ`` may cause memory leaks. Refer to the system documentation for putenv. When :func:`putenv` is supported, assignments to items in ``os.environ`` are @@ -488,7 +488,7 @@ process and user. Availability: Unix. - .. note:: On Mac OS X, the length of *groups* may not exceed the + .. note:: On macOS, the length of *groups* may not exceed the system-defined maximum number of effective group ids, typically 16. See the documentation for :func:`getgroups` for cases where it may not return the same group list set by calling setgroups(). @@ -1130,11 +1130,11 @@ or `the MSDN `_ on Windo On Linux, if *offset* is given as ``None``, the bytes are read from the current position of *in* and the position of *in* is updated. - The second case may be used on Mac OS X and FreeBSD where *headers* and + The second case may be used on macOS and FreeBSD where *headers* and *trailers* are arbitrary sequences of buffers that are written before and after the data from *in* is written. It returns the same as the first case. - On Mac OS X and FreeBSD, a value of 0 for *count* specifies to send until + On macOS and FreeBSD, a value of 0 for *count* specifies to send until the end of *in* is reached. All platforms support sockets as *out* file descriptor, and some platforms @@ -2372,7 +2372,7 @@ features: Time of file creation. - On Mac OS systems, the following attributes may also be available: + On macOS systems, the following attributes may also be available: .. attribute:: st_rsize diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst index ee1ce50b6bd5e1..d97968aead8757 100644 --- a/Doc/library/othergui.rst +++ b/Doc/library/othergui.rst @@ -3,7 +3,7 @@ Other Graphical User Interface Packages ======================================= -Major cross-platform (Windows, Mac OS X, Unix-like) GUI toolkits are +Major cross-platform (Windows, macOS, Unix-like) GUI toolkits are available for Python: .. seealso:: @@ -25,7 +25,7 @@ available for Python: `PyQt `_ PyQt is a :program:`sip`\ -wrapped binding to the Qt toolkit. Qt is an extensive C++ GUI application development framework that is - available for Unix, Windows and Mac OS X. :program:`sip` is a tool + available for Unix, Windows and macOS. :program:`sip` is a tool for generating bindings for C++ libraries as Python classes, and is specifically designed for Python. The *PyQt3* bindings have a book, `GUI Programming with Python: QT Edition @@ -43,7 +43,7 @@ available for Python: wxPython is a cross-platform GUI toolkit for Python that is built around the popular `wxWidgets `_ (formerly wxWindows) C++ toolkit. It provides a native look and feel for applications on - Windows, Mac OS X, and Unix systems by using each platform's native + Windows, macOS, and Unix systems by using each platform's native widgets where ever possible, (GTK+ on Unix-like systems). In addition to an extensive set of widgets, wxPython provides classes for online documentation and context sensitive help, printing, HTML viewing, diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst index eea0abbae4d41e..77d0cd42d7b1d0 100644 --- a/Doc/library/platform.rst +++ b/Doc/library/platform.rst @@ -42,7 +42,7 @@ Cross Platform .. note:: - On Mac OS X (and perhaps other platforms), executable files may be + On macOS (and perhaps other platforms), executable files may be universal files containing multiple architectures. To get at the "64-bitness" of the current interpreter, it is more @@ -226,13 +226,13 @@ Win95/98 specific especially the :ref:`subprocess-replacements` section. -Mac OS Platform +macOS Platform --------------- .. function:: mac_ver(release='', versioninfo=('','',''), machine='') - Get Mac OS version information and return it as tuple ``(release, versioninfo, + Get macOS version information and return it as tuple ``(release, versioninfo, machine)`` with *versioninfo* being a tuple ``(version, dev_stage, non_release_version)``. diff --git a/Doc/library/plistlib.rst b/Doc/library/plistlib.rst index 9ba226607d1fee..2a0f58d0cc7012 100644 --- a/Doc/library/plistlib.rst +++ b/Doc/library/plistlib.rst @@ -1,8 +1,8 @@ -:mod:`plistlib` --- Generate and parse Mac OS X ``.plist`` files +:mod:`plistlib` --- Generate and parse macOS ``.plist`` files ================================================================ .. module:: plistlib - :synopsis: Generate and parse Mac OS X plist files. + :synopsis: Generate and parse macOS plist files. .. moduleauthor:: Jack Jansen .. sectionauthor:: Georg Brandl @@ -17,7 +17,7 @@ -------------- This module provides an interface for reading and writing the "property list" -files used mainly by Mac OS X and supports both binary and XML plist files. +files used mainly by macOS and supports both binary and XML plist files. The property list (``.plist``) file format is a simple serialization supporting basic object types, like dictionaries, lists, numbers and strings. Usually the diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst index 959d9b98a84691..080b595103bc5f 100644 --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -574,7 +574,7 @@ procedure can be used to obtain a better constant for a given platform (see The method executes the number of Python calls given by the argument, directly and again under the profiler, measuring the time for both. It then computes the hidden overhead per profiler event, and returns that as a float. For example, -on a 1.8Ghz Intel Core i5 running Mac OS X, and using Python's time.clock() as +on a 1.8Ghz Intel Core i5 running macOS, and using Python's time.clock() as the timer, the magical number is about 4.04e-6. The object of this exercise is to get a fairly consistent result. If your diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst index 54c54b461ce7e4..410029707c700d 100644 --- a/Doc/library/readline.rst +++ b/Doc/library/readline.rst @@ -21,7 +21,7 @@ function. The underlying Readline library API may be implemented by the ``libedit`` library instead of GNU readline. - On MacOS X the :mod:`readline` module detects which library is being used + On macOS the :mod:`readline` module detects which library is being used at run time. The configuration file for ``libedit`` is different from that diff --git a/Doc/library/select.rst b/Doc/library/select.rst index f97118ebe05788..fc399d73189446 100644 --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -516,7 +516,7 @@ https://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2 | :const:`KQ_FILTER_PROC` | Watch for events on a process id | +---------------------------+---------------------------------------------+ | :const:`KQ_FILTER_NETDEV` | Watch for events on a network device | - | | [not available on Mac OS X] | + | | [not available on macOS] | +---------------------------+---------------------------------------------+ | :const:`KQ_FILTER_SIGNAL` | Returns whenever the watched signal is | | | delivered to the process | @@ -608,7 +608,7 @@ https://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2 | :const:`KQ_NOTE_TRACKERR` | unable to attach to a child | +----------------------------+--------------------------------------------+ - :const:`KQ_FILTER_NETDEV` filter flags (not available on Mac OS X): + :const:`KQ_FILTER_NETDEV` filter flags (not available on macOS): +----------------------------+--------------------------------------------+ | Constant | Meaning | diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index a85bf339ae1bc8..7b75cd95328de2 100644 --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -26,7 +26,7 @@ copying and removal. For operations on individual files, see also the :func:`shutil.copy2`) cannot copy all file metadata. On POSIX platforms, this means that file owner and group are lost as well - as ACLs. On Mac OS, the resource fork and other metadata are not used. + as ACLs. On macOS, the resource fork and other metadata are not used. This means that resources will be lost and file type and creator codes will not be correct. On Windows, file owners, ACLs and alternate data streams are not copied. diff --git a/Doc/library/site.rst b/Doc/library/site.rst index 43daf790b77cb0..fbe736d7be3897 100644 --- a/Doc/library/site.rst +++ b/Doc/library/site.rst @@ -158,7 +158,7 @@ Module contents Path to the user site-packages for the running Python. Can be ``None`` if :func:`getusersitepackages` hasn't been called yet. Default value is :file:`~/.local/lib/python{X.Y}/site-packages` for UNIX and non-framework Mac - OS X builds, :file:`~/Library/Python/{X.Y}/lib/python/site-packages` for Mac + macOS builds, :file:`~/Library/Python/{X.Y}/lib/python/site-packages` for Mac framework builds, and :file:`{%APPDATA%}\\Python\\Python{XY}\\site-packages` on Windows. This directory is a site directory, which means that :file:`.pth` files in it will be processed. @@ -168,7 +168,7 @@ Module contents Path to the base directory for the user site-packages. Can be ``None`` if :func:`getuserbase` hasn't been called yet. Default value is - :file:`~/.local` for UNIX and Mac OS X non-framework builds, + :file:`~/.local` for UNIX and macOS non-framework builds, :file:`~/Library/Python/{X.Y}` for Mac framework builds, and :file:`{%APPDATA%}\\Python` for Windows. This value is used by Distutils to compute the installation directories for scripts, data files, Python modules, diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst index 5635577da0f946..bcdcb765f90f40 100644 --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -1007,7 +1007,7 @@ only makes sense to call from a different thread. .. rubric:: Footnotes .. [#f1] The sqlite3 module is not built with loadable extension support by - default, because some platforms (notably Mac OS X) have SQLite + default, because some platforms (notably macOS) have SQLite libraries which are compiled without this feature. To get loadable extension support, you must pass --enable-loadable-sqlite-extensions to configure. diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 07b97715a985b5..9000a9b7d8d68e 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -18,7 +18,7 @@ This module provides access to Transport Layer Security (often known as "Secure Sockets Layer") encryption and peer authentication facilities for network sockets, both client-side and server-side. This module uses the OpenSSL -library. It is available on all modern Unix systems, Windows, Mac OS X, and +library. It is available on all modern Unix systems, Windows, macOS, and probably additional platforms, as long as OpenSSL is installed on that platform. .. note:: diff --git a/Doc/library/stat.rst b/Doc/library/stat.rst index b256312d91a806..8af0f49870518e 100644 --- a/Doc/library/stat.rst +++ b/Doc/library/stat.rst @@ -372,11 +372,11 @@ The following flags can be used in the *flags* argument of :func:`os.chflags`: .. data:: UF_COMPRESSED - The file is stored compressed (Mac OS X 10.6+). + The file is stored compressed (macOS 10.6+). .. data:: UF_HIDDEN - The file should not be displayed in a GUI (Mac OS X 10.5+). + The file should not be displayed in a GUI (macOS 10.5+). .. data:: SF_ARCHIVED @@ -398,7 +398,7 @@ The following flags can be used in the *flags* argument of :func:`os.chflags`: The file is a snapshot file. -See the \*BSD or Mac OS systems man page :manpage:`chflags(2)` for more information. +See the \*BSD or macOS systems man page :manpage:`chflags(2)` for more information. On Windows, the following file attribute constants are available for use when testing bits in the ``st_file_attributes`` member returned by :func:`os.stat`. diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index 54b99e0fd999f1..2e91031429335a 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -449,7 +449,7 @@ always available. :func:`os.fsencode` and :func:`os.fsdecode` should be used to ensure that the correct encoding and errors mode are used. - * On Mac OS X, the encoding is ``'utf-8'``. + * On macOS, the encoding is ``'utf-8'``. * On Unix, the encoding is the locale encoding. @@ -928,7 +928,7 @@ always available. Linux ``'linux'`` Windows ``'win32'`` Windows/Cygwin ``'cygwin'`` - Mac OS X ``'darwin'`` + macOS ``'darwin'`` ================ =========================== .. versionchanged:: 3.3 diff --git a/Doc/library/sysconfig.rst b/Doc/library/sysconfig.rst index 08b74a9affd24f..b1ac53be40bf39 100644 --- a/Doc/library/sysconfig.rst +++ b/Doc/library/sysconfig.rst @@ -74,7 +74,7 @@ places. Python currently supports seven schemes: -- *posix_prefix*: scheme for Posix platforms like Linux or Mac OS X. This is +- *posix_prefix*: scheme for Posix platforms like Linux or macOS. This is the default scheme used when Python or a component is installed. - *posix_home*: scheme for Posix platforms used when a *home* option is used upon installation. This scheme is used when a component is installed through @@ -192,7 +192,7 @@ Other functions - win-ia64 (64bit Windows on Itanium) - win32 (all others - specifically, sys.platform is returned) - Mac OS X can return: + macOS can return: - macosx-10.6-ppc - macosx-10.4-ppc64 diff --git a/Doc/library/tkinter.ttk.rst b/Doc/library/tkinter.ttk.rst index 3dad182cccdf89..525764a034049d 100644 --- a/Doc/library/tkinter.ttk.rst +++ b/Doc/library/tkinter.ttk.rst @@ -678,7 +678,7 @@ ones inherited from :class:`ttk.Widget`. Platform-specific notes ^^^^^^^^^^^^^^^^^^^^^^^ -* On MacOS X, toplevel windows automatically include a built-in size grip +* On macOS, toplevel windows automatically include a built-in size grip by default. Adding a :class:`Sizegrip` is harmless, since the built-in grip will just mask the widget. diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index 5a10f9571e9e87..b5fc5c4b1ec4f8 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -165,8 +165,8 @@ The :mod:`urllib.request` module defines the following functions: This helper function returns a dictionary of scheme to proxy server URL mappings. It scans the environment for variables named ``_proxy``, in a case insensitive approach, for all operating systems first, and when it - cannot find it, looks for proxy information from Mac OSX System - Configuration for Mac OS X and Windows Systems Registry for Windows. + cannot find it, looks for proxy information from macOS System + Configuration for macOS and Windows Systems Registry for Windows. If both lowercase and uppercase environment variables exist (and disagree), lowercase is preferred. @@ -299,8 +299,8 @@ The following classes are provided: the list of proxies from the environment variables :envvar:`_proxy`. If no proxy environment variables are set, then in a Windows environment proxy settings are obtained from the registry's - Internet Settings section, and in a Mac OS X environment proxy information - is retrieved from the OS X System Configuration Framework. + Internet Settings section, and in a macOS environment proxy information + is retrieved from the macOS System Configuration Framework. To disable autodetected proxy pass an empty dictionary. diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst index 85d36367221295..5540117db51a01 100644 --- a/Doc/library/webbrowser.rst +++ b/Doc/library/webbrowser.rst @@ -136,9 +136,9 @@ for the controller classes, all defined in this module. +------------------------+-----------------------------------------+-------+ | ``'windows-default'`` | :class:`WindowsDefault` | \(2) | +------------------------+-----------------------------------------+-------+ -| ``'macosx'`` | :class:`MacOSX('default')` | \(3) | +| ``'macosx'`` | :class:`macOS('default')` | \(3) | +------------------------+-----------------------------------------+-------+ -| ``'safari'`` | :class:`MacOSX('safari')` | \(3) | +| ``'safari'`` | :class:`macOS('safari')` | \(3) | +------------------------+-----------------------------------------+-------+ | ``'google-chrome'`` | :class:`Chrome('google-chrome')` | | +------------------------+-----------------------------------------+-------+ @@ -162,7 +162,7 @@ Notes: Only on Windows platforms. (3) - Only on Mac OS X platform. + Only on macOS platform. .. versionadded:: 3.3 Support for Chrome/Chromium has been added. diff --git a/Doc/license.rst b/Doc/license.rst index 49d29cee314e40..338c8758619208 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -662,7 +662,7 @@ OpenSSL The modules :mod:`hashlib`, :mod:`posix`, :mod:`ssl`, :mod:`crypt` use the OpenSSL library for added performance if made available by the -operating system. Additionally, the Windows and Mac OS X installers for +operating system. Additionally, the Windows and macOS installers for Python may include a copy of the OpenSSL libraries, so we include a copy of the OpenSSL license here:: diff --git a/Doc/tutorial/appetite.rst b/Doc/tutorial/appetite.rst index 26e5168ab51a7a..3fa68097ee3665 100644 --- a/Doc/tutorial/appetite.rst +++ b/Doc/tutorial/appetite.rst @@ -23,7 +23,7 @@ You could write a Unix shell script or Windows batch files for some of these tasks, but shell scripts are best at moving around files and changing text data, not well-suited for GUI applications or games. You could write a C/C++/Java program, but it can take a lot of development time to get even a first-draft -program. Python is simpler to use, available on Windows, Mac OS X, and Unix +program. Python is simpler to use, available on Windows, macOS, and Unix operating systems, and will help you get the job done more quickly. Python is simple to use, but it is a real programming language, offering much diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 195f63f0a319da..033a4539a43869 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -527,7 +527,7 @@ conflict. .. envvar:: PYTHONCASEOK If this is set, Python ignores case in :keyword:`import` statements. This - only works on Windows and OS X. + only works on Windows and macOS. .. envvar:: PYTHONDONTWRITEBYTECODE @@ -600,7 +600,7 @@ conflict. If this environment variable is set, ``sys.argv[0]`` will be set to its value instead of the value got through the C runtime. Only works on - Mac OS X. + macOS. .. envvar:: PYTHONWARNINGS diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst index 8f1ac3f3fd3a97..606c01fae94cfe 100644 --- a/Doc/using/mac.rst +++ b/Doc/using/mac.rst @@ -8,7 +8,7 @@ Using Python on a Macintosh :Author: Bob Savage -Python on a Macintosh running Mac OS X is in principle very similar to Python on +Python on a Macintosh running macOS is in principle very similar to Python on any other Unix platform, but there are a number of additional features such as the IDE and the Package Manager that are worth pointing out. @@ -17,7 +17,7 @@ the IDE and the Package Manager that are worth pointing out. Getting and Installing MacPython ================================ -Mac OS X 10.8 comes with Python 2.7 pre-installed by Apple. If you wish, you +macOS 10.8 comes with Python 2.7 pre-installed by Apple. If you wish, you are invited to install the most recent version of Python 3 from the Python website (https://www.python.org). A current "universal binary" build of Python, which runs natively on the Mac's new Intel and legacy PPC CPU's, is available @@ -55,12 +55,12 @@ section on running Python scripts from the Unix shell. How to run a Python script -------------------------- -Your best way to get started with Python on Mac OS X is through the IDLE +Your best way to get started with Python on macOS is through the IDLE integrated development environment, see section :ref:`ide` and use the Help menu when the IDE is running. If you want to run Python scripts from the Terminal window command line or from -the Finder you first need an editor to create your script. Mac OS X comes with a +the Finder you first need an editor to create your script. macOS comes with a number of standard Unix command line editors, :program:`vim` and :program:`emacs` among them. If you want a more Mac-like editor, :program:`BBEdit` or :program:`TextWrangler` from Bare Bones Software (see @@ -88,7 +88,7 @@ To run your script from the Finder you have two options: Running scripts with a GUI -------------------------- -With older versions of Python, there is one Mac OS X quirk that you need to be +With older versions of Python, there is one macOS quirk that you need to be aware of: programs that talk to the Aqua window manager (in other words, anything that has a GUI) need to be run in a special way. Use :program:`pythonw` instead of :program:`python` to start such scripts. @@ -99,7 +99,7 @@ With Python 3.6, you can use either :program:`python` or :program:`pythonw`. Configuration ------------- -Python on OS X honors all standard Unix environment variables such as +Python on macOS honors all standard Unix environment variables such as :envvar:`PYTHONPATH`, but setting these variables for programs started from the Finder is non-standard as the Finder does not read your :file:`.profile` or :file:`.cshrc` at startup. You need to create a file @@ -149,10 +149,10 @@ X by Apple, and the latest version can be downloaded and installed from https://www.activestate.com; it can also be built from source. *wxPython* is another popular cross-platform GUI toolkit that runs natively on -Mac OS X. Packages and documentation are available from http://www.wxpython.org. +macOS. Packages and documentation are available from http://www.wxpython.org. *PyQt* is another popular cross-platform GUI toolkit that runs natively on Mac -OS X. More information can be found at +macOS. More information can be found at https://riverbankcomputing.com/software/pyqt/intro. diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst index 5cbf50112385f4..4dfb5b4cb525a6 100644 --- a/Doc/whatsnew/2.0.rst +++ b/Doc/whatsnew/2.0.rst @@ -574,7 +574,7 @@ mostly by Trent Mick of ActiveState. (Confusingly, ``sys.platform`` is still treats code as 32 bit on Itanium.) PythonWin also supports Windows CE; see the Python CE page at http://pythonce.sourceforge.net/ for more information. -Another new platform is Darwin/MacOS X; initial support for it is in Python 2.0. +Another new platform is Darwin/macOS; initial support for it is in Python 2.0. Dynamic loading works, if you specify "configure --with-dyld --with-suffix=.x". Consult the README in the Python source distribution for more instructions. diff --git a/Doc/whatsnew/2.1.rst b/Doc/whatsnew/2.1.rst index 3486cddc05e9f4..cb405dfc6ed721 100644 --- a/Doc/whatsnew/2.1.rst +++ b/Doc/whatsnew/2.1.rst @@ -774,7 +774,7 @@ of the more notable changes are: * The size of the Unicode character database was shrunk by another 340K thanks to Fredrik Lundh. -* Some new ports were contributed: MacOS X (by Steven Majewski), Cygwin (by +* Some new ports were contributed: macOS (by Steven Majewski), Cygwin (by Jason Tishler); RISCOS (by Dietmar Schwertberger); Unixware 7 (by Billy G. Allie). diff --git a/Doc/whatsnew/2.2.rst b/Doc/whatsnew/2.2.rst index a0bb81a9748663..ad48eda47133ee 100644 --- a/Doc/whatsnew/2.2.rst +++ b/Doc/whatsnew/2.2.rst @@ -1137,12 +1137,12 @@ bugs. These figures are likely to be underestimates. Some of the more notable changes are: * The code for the MacOS port for Python, maintained by Jack Jansen, is now kept - in the main Python CVS tree, and many changes have been made to support MacOS X. + in the main Python CVS tree, and many changes have been made to support macOS. The most significant change is the ability to build Python as a framework, enabled by supplying the :option:`!--enable-framework` option to the configure script when compiling Python. According to Jack Jansen, "This installs a - self-contained Python installation plus the OS X framework "glue" into + self-contained Python installation plus the macOS framework "glue" into :file:`/Library/Frameworks/Python.framework` (or another location of choice). For now there is little immediate added benefit to this (actually, there is the disadvantage that you have to change your PATH to be able to find Python), but @@ -1151,7 +1151,7 @@ Some of the more notable changes are: much more." Most of the MacPython toolbox modules, which interface to MacOS APIs such as - windowing, QuickTime, scripting, etc. have been ported to OS X, but they've been + windowing, QuickTime, scripting, etc. have been ported to macOS, but they've been left commented out in :file:`setup.py`. People who want to experiment with these modules can uncomment them manually. diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst index 4d482918313239..6e19d3e0c5d59c 100644 --- a/Doc/whatsnew/2.5.rst +++ b/Doc/whatsnew/2.5.rst @@ -2206,10 +2206,10 @@ Changes to Python's build process and to the C API include: Port-Specific Changes --------------------- -* MacOS X (10.3 and higher): dynamic loading of modules now uses the +* macOS (10.3 and higher): dynamic loading of modules now uses the :c:func:`dlopen` function instead of MacOS-specific functions. -* MacOS X: an :option:`!--enable-universalsdk` switch was added to the +* macOS: an :option:`!--enable-universalsdk` switch was added to the :program:`configure` script that compiles the interpreter as a universal binary able to run on both PowerPC and Intel processors. (Contributed by Ronald Oussoren; :issue:`2573`.) diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst index cc2fa3dcfa50ce..cb5d3aeff88feb 100644 --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -529,11 +529,11 @@ all users using a machine or a particular site installation. Python 2.6 introduces a convention for user-specific site directories. The directory varies depending on the platform: -* Unix and Mac OS X: :file:`~/.local/` +* Unix and macOS: :file:`~/.local/` * Windows: :file:`%APPDATA%/Python` Within this directory, there will be version-specific subdirectories, -such as :file:`lib/python2.6/site-packages` on Unix/Mac OS and +such as :file:`lib/python2.6/site-packages` on Unix/macOS and :file:`Python26/site-packages` on Windows. If you don't like the default directory, it can be overridden by an @@ -2802,12 +2802,12 @@ Ippolito. The :mod:`plistlib` module: A Property-List Parser -------------------------------------------------- -The ``.plist`` format is commonly used on Mac OS X to +The ``.plist`` format is commonly used on macOS to store basic data types (numbers, strings, lists, and dictionaries) by serializing them into an XML-based format. It resembles the XML-RPC serialization of data types. -Despite being primarily used on Mac OS X, the format +Despite being primarily used on macOS, the format has nothing Mac-specific about it and the Python implementation works on any platform that Python supports, so the :mod:`plistlib` module has been promoted to the standard library. @@ -2990,7 +2990,7 @@ Changes to Python's build process and to the C API include: :file:`PCbuild` directory for the build files. (Implemented by Christian Heimes.) -* On Mac OS X, Python 2.6 can be compiled as a 4-way universal build. +* On macOS, Python 2.6 can be compiled as a 4-way universal build. The :program:`configure` script can take a :option:`!--with-universal-archs=[32-bit|64-bit|all]` switch, controlling whether the binaries are built for 32-bit @@ -3142,7 +3142,7 @@ Port-Specific Changes: Windows .. ====================================================================== -Port-Specific Changes: Mac OS X +Port-Specific Changes: macOS ----------------------------------- * When compiling a framework build of Python, you can now specify the @@ -3154,7 +3154,7 @@ Port-Specific Changes: Mac OS X :func:`macostools.touched` function to be removed because it depended on the :mod:`macfs` module. (:issue:`1490190`) -* Many other Mac OS modules have been deprecated and will be removed in +* Many other macOS modules have been deprecated and will be removed in Python 3.0: :mod:`_builtinSuites`, :mod:`aepack`, diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst index 55392fc2be0872..3011e788636687 100644 --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -2359,7 +2359,7 @@ Port-Specific Changes: Windows .. ====================================================================== -Port-Specific Changes: Mac OS X +Port-Specific Changes: macOS ----------------------------------- * The path ``/Library/Python/2.7/site-packages`` is now appended to diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst index 5ecf2ebfe79c4b..8a116fb8b105f0 100644 --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -559,7 +559,7 @@ review: longer used) and :mod:`md5` (replaced by :mod:`hashlib`), were already deprecated by :pep:`4`. Others were removed as a result of the removal of support for various platforms such as Irix, BeOS - and Mac OS 9 (see :pep:`11`). Some modules were also selected for + and macOS 9 (see :pep:`11`). Some modules were also selected for removal in Python 3.0 due to lack of use or because a better replacement exists. See :pep:`3108` for an exhaustive list. @@ -855,7 +855,7 @@ Due to time constraints, here is a *very* incomplete list of changes to the C API. * Support for several platforms was dropped, including but not limited - to Mac OS 9, BeOS, RISCOS, Irix, and Tru64. + to macOS 9, BeOS, RISCOS, Irix, and Tru64. * :pep:`3118`: New Buffer API. diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst index b900e7733f0f3e..c960aad47a6907 100644 --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -2439,7 +2439,7 @@ decoding, and ``'strict'`` and ``'replace'`` for encoding. To emulate Python3.1 MBCS encoding, select the ``'ignore'`` handler for decoding and the ``'replace'`` handler for encoding. -On Mac OS X, Python decodes command line arguments with ``'utf-8'`` rather than +On macOS, Python decodes command line arguments with ``'utf-8'`` rather than the locale encoding. By default, :mod:`tarfile` uses ``'utf-8'`` encoding on Windows (instead of @@ -2493,7 +2493,7 @@ IDLE (Contributed by Raymond Hettinger; :issue:`5150`.) -* IDLE on Mac OS X now works with both Carbon AquaTk and Cocoa AquaTk. +* IDLE on macOS now works with both Carbon AquaTk and Cocoa AquaTk. (Contributed by Kevin Walzer, Ned Deily, and Ronald Oussoren; :issue:`6075`.) @@ -2588,9 +2588,9 @@ Changes to Python's build process and to the C API include: There were a number of other small changes to the C-API. See the :source:`Misc/NEWS` file for a complete list. -Also, there were a number of updates to the Mac OS X build, see +Also, there were a number of updates to the macOS build, see :source:`Mac/BuildScript/README.txt` for details. For users running a 32/64-bit -build, there is a known problem with the default Tcl/Tk on Mac OS X 10.6. +build, there is a known problem with the default Tcl/Tk on macOS 10.6. Accordingly, we recommend installing an updated alternative such as `ActiveState Tcl/Tk 8.5.9 `_\. See https://www.python.org/download/mac/tcltk/ for additional details. diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst index 93b297cf6532b0..a7445260a0fb8c 100644 --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1895,7 +1895,7 @@ socket https://oss.oracle.com/projects/rds/). * The :class:`~socket.socket` class now supports the ``PF_SYSTEM`` protocol - family on OS X. (Contributed by Michael Goderbauer in :issue:`13777`.) + family on macOS. (Contributed by Michael Goderbauer in :issue:`13777`.) * New function :func:`~socket.sethostname` allows the hostname to be set on unix systems if the calling process has sufficient privileges. diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index 72398f9250fe9e..4864b15e400efe 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -208,7 +208,7 @@ the ``make install`` and ``make altinstall`` commands bootstrap ``pip`` by default. This behaviour can be controlled through configure options, and overridden through Makefile options. -On Windows and Mac OS X, the CPython installers now default to installing +On Windows and macOS, the CPython installers now default to installing ``pip`` along with CPython itself (users may opt out of installing it during the installation process). Window users will need to opt in to the automatic ``PATH`` modifications to have ``pip`` available from the command diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index edb74f043e0b64..256932375023f3 100644 --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -2252,7 +2252,7 @@ loaded): * If built in debug mode, ```` will be ``_d``, otherwise it will be blank. -* On OS X platforms, extension module filenames now end with ``-darwin.so``. +* On macOS platforms, extension module filenames now end with ``-darwin.so``. * On all other platforms, extension module filenames are the same as they were with Python 3.4. diff --git a/Include/py_curses.h b/Include/py_curses.h index 336c95d360d159..9c33ff9603bb83 100644 --- a/Include/py_curses.h +++ b/Include/py_curses.h @@ -4,14 +4,14 @@ #ifdef __APPLE__ /* -** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards +** On macOS 10.2 [n]curses.h and stdlib.h use different guards ** against multiple definition of wchar_t. */ #ifdef _BSD_WCHAR_T_DEFINED_ #define _WCHAR_T #endif -/* the following define is necessary for OS X 10.6; without it, the +/* the following define is necessary for macOS 10.6; without it, the Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python can't get at the WINDOW flags field. */ #define NCURSES_OPAQUE 0 diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h index 9dde11bd58e217..cbf39db12ee860 100644 --- a/Include/pymacconfig.h +++ b/Include/pymacconfig.h @@ -2,7 +2,7 @@ #define PYMACCONFIG_H /* * This file moves some of the autoconf magic to compile-time - * when building on MacOSX. This is needed for building 4-way + * when building on macOS. This is needed for building 4-way * universal binaries and for 64-bit universal binaries because * the values redefined below aren't configure-time constant but * only compile-time constant in these scenarios. @@ -61,7 +61,7 @@ # endif # if defined(__LP64__) - /* MacOSX 10.4 (the first release to support 64-bit code + /* macOS 10.4 (the first release to support 64-bit code * at all) only supports 64-bit in the UNIX layer. * Therefore suppress the toolbox-glue in 64-bit mode. */ diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py index eadf06f20e2507..8ad7b3885a3426 100644 --- a/Lib/_osx_support.py +++ b/Lib/_osx_support.py @@ -1,4 +1,4 @@ -"""Shared OS X support functions.""" +"""Shared macOS support functions.""" import os import re @@ -81,7 +81,7 @@ def _find_build_tool(toolname): _SYSTEM_VERSION = None def _get_system_version(): - """Return the OS X system version as a string""" + """Return the macOS system version as a string""" # Reading this plist is a documented way to get the system # version (see the documentation for the Gestalt Manager) # We avoid using platform.mac_ver to avoid possible bootstrap issues during @@ -391,7 +391,7 @@ def customize_config_vars(_config_vars): """ if not _supports_universal_builds(): - # On Mac OS X before 10.4, check if -arch and -isysroot + # On macOS before 10.4, check if -arch and -isysroot # are in CFLAGS or LDFLAGS and remove them if they are. # This is needed when building extensions on a 10.3 system # using a universal build of python. diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py index 2806ea8dc9089d..4dc9d147c5485c 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -481,7 +481,7 @@ def __init__(self, loop, pipe, protocol, waiter=None, extra=None): # On AIX, the reader trick (to be notified when the read end of the # socket is closed) only works for sockets. On other platforms it - # works for pipes and sockets. (Exception: OS X 10.4? Issue #19294.) + # works for pipes and sockets. (Exception: macOS 10.4? Issue #19294.) if is_socket or (is_fifo and not sys.platform.startswith("aix")): # only start reading when connection_made() has been called self._loop.call_soon(self._loop._add_reader, diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py index 8f1d714193ab79..2cebd059461988 100644 --- a/Lib/concurrent/futures/process.py +++ b/Lib/concurrent/futures/process.py @@ -254,7 +254,7 @@ def shutdown_worker(): # Release the queue's resources as soon as possible. call_queue.close() # If .join() is not called on the created processes then - # some multiprocessing.Queue methods may deadlock on Mac OS X. + # some multiprocessing.Queue methods may deadlock on macOS. for p in processes.values(): p.join() diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py index f8709683fb681f..6b5da5110cdd06 100644 --- a/Lib/ctypes/__init__.py +++ b/Lib/ctypes/__init__.py @@ -21,9 +21,9 @@ DEFAULT_MODE = RTLD_LOCAL if _os.name == "posix" and _sys.platform == "darwin": - # On OS X 10.3, we use RTLD_GLOBAL as default mode + # On macOS 10.3, we use RTLD_GLOBAL as default mode # because RTLD_LOCAL does not work at least on some - # libraries. OS X 10.3 is Darwin 7, so we check for + # libraries. macOS 10.3 is Darwin 7, so we check for # that. if int(_os.uname().release.split('.')[0]) < 8: diff --git a/Lib/ctypes/test/test_cfuncs.py b/Lib/ctypes/test/test_cfuncs.py index ac2240fa197d3f..286aa52fe5b4ac 100644 --- a/Lib/ctypes/test/test_cfuncs.py +++ b/Lib/ctypes/test/test_cfuncs.py @@ -1,4 +1,4 @@ -# A lot of failures in these tests on Mac OS X. +# A lot of failures in these tests on macOS. # Byte order related? import unittest diff --git a/Lib/distutils/command/bdist.py b/Lib/distutils/command/bdist.py index 014871d280edb5..9296d0760c11be 100644 --- a/Lib/distutils/command/bdist.py +++ b/Lib/distutils/command/bdist.py @@ -56,7 +56,7 @@ class bdist(Command): no_format_option = ('bdist_rpm',) # This won't do in reality: will need to distinguish RPM-ish Linux, - # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS. + # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, macOS. default_format = {'posix': 'gztar', 'nt': 'zip'} diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py index 62a24516cfafe5..efc3ac0685915c 100644 --- a/Lib/distutils/dist.py +++ b/Lib/distutils/dist.py @@ -754,7 +754,7 @@ def get_command_list(self): self.cmdclass, but not a standard command). The descriptions come from the command class attribute 'description'. """ - # Currently this is only used on Mac OS, for the Mac-only GUI + # Currently this is only used on macOS, for the Mac-only GUI # Distutils interface (by Jack Jansen) import distutils.command std_commands = distutils.command.__all__ diff --git a/Lib/distutils/file_util.py b/Lib/distutils/file_util.py index b3fee35a6cce81..c02a8fd796a149 100644 --- a/Lib/distutils/file_util.py +++ b/Lib/distutils/file_util.py @@ -83,7 +83,7 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0, linking is available. If hardlink fails, falls back to _copy_file_contents(). - Under Mac OS, uses the native file copy function in macostools; on + Under macOS, uses the native file copy function in macostools; on other systems, uses '_copy_file_contents()' to copy file contents. Return a tuple (dest_name, copied): 'dest_name' is the actual name of diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py index c92d5fdba393bb..7715aa423c8e8a 100644 --- a/Lib/distutils/filelist.py +++ b/Lib/distutils/filelist.py @@ -183,7 +183,7 @@ def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0): are not quite the same as implemented by the 'fnmatch' module: '*' and '?' match non-special characters, where "special" is platform- dependent: slash on Unix; colon, slash, and backslash on - DOS/Windows; and colon on Mac OS. + DOS/Windows; and colon on macOS. If 'anchor' is true (the default), then the pattern match is more stringent: "*.py" will match "foo.py" but not "foo/bar.py". If diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index 8bf1a7016bdf42..030abe9b425492 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -159,7 +159,7 @@ def customize_compiler(compiler): if compiler.compiler_type == "unix": if sys.platform == "darwin": # Perform first-time customization of compiler-related - # config vars on OS X now that we know we need a compiler. + # config vars on macOS now that we know we need a compiler. # This is primarily to support Pythons from binary # installers. The kind and paths to build tools on # the user system may vary significantly from the system @@ -182,7 +182,7 @@ def customize_compiler(compiler): if (sys.platform == 'darwin' and 'LDSHARED' not in os.environ and ldshared.startswith(cc)): - # On OS X, if CC is overridden, use that as the default + # On macOS, if CC is overridden, use that as the default # command for LDSHARED as well ldshared = newcc + ldshared[len(cc):] cc = newcc @@ -510,7 +510,7 @@ def get_config_vars(*args): srcdir = os.path.join(base, _config_vars['srcdir']) _config_vars['srcdir'] = os.path.normpath(srcdir) - # OS X platforms require special customization to handle + # macOS platforms require special customization to handle # multi-architecture, multi-os-version installers if sys.platform == 'darwin': import _osx_support diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py index 7385c6bbf67171..f1b16dab415d64 100644 --- a/Lib/distutils/tests/support.py +++ b/Lib/distutils/tests/support.py @@ -190,7 +190,7 @@ def fixup_build_ext(cmd): support.fixup_build_ext(cmd) cmd.ensure_finalized() - Unlike most other Unix platforms, Mac OS X embeds absolute paths + Unlike most other Unix platforms, macOS embeds absolute paths to shared libraries into executables, so the fixup is not needed there. """ if os.name == 'nt': diff --git a/Lib/distutils/tests/test_bdist_rpm.py b/Lib/distutils/tests/test_bdist_rpm.py index 6453a02b88f600..807bb7709808bf 100644 --- a/Lib/distutils/tests/test_bdist_rpm.py +++ b/Lib/distutils/tests/test_bdist_rpm.py @@ -41,9 +41,9 @@ def tearDown(self): super(BuildRpmTestCase, self).tearDown() # XXX I am unable yet to make this test work without - # spurious sdtout/stderr output under Mac OS X + # spurious sdtout/stderr output under macOS @unittest.skipUnless(sys.platform.startswith('linux'), - 'spurious sdtout/stderr output under Mac OS X') + 'spurious sdtout/stderr output under macOS') @requires_zlib @unittest.skipIf(find_executable('rpm') is None, 'the rpm command is not found') @@ -84,9 +84,9 @@ def test_quiet(self): self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm'), dist.dist_files) # XXX I am unable yet to make this test work without - # spurious sdtout/stderr output under Mac OS X + # spurious sdtout/stderr output under macOS @unittest.skipUnless(sys.platform.startswith('linux'), - 'spurious sdtout/stderr output under Mac OS X') + 'spurious sdtout/stderr output under macOS') @requires_zlib # http://bugs.python.org/issue1533164 @unittest.skipIf(find_executable('rpm') is None, diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index be7f5f38aafda7..2022abdc9f2728 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -402,21 +402,21 @@ def test_ext_fullpath(self): self.assertEqual(wanted, path) - @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX') + @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for macOS') def test_deployment_target_default(self): # Issue 9516: Test that, in the absence of the environment variable, # an extension module is compiled with the same deployment target as # the interpreter. self._try_compile_deployment_target('==', None) - @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX') + @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for macOS') def test_deployment_target_too_low(self): # Issue 9516: Test that an extension module is not allowed to be # compiled with a deployment target less than that of the interpreter. self.assertRaises(DistutilsPlatformError, self._try_compile_deployment_target, '>', '10.1') - @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX') + @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for macOS') def test_deployment_target_higher_ok(self): # Issue 9516: Test that an extension module can be compiled with a # deployment target higher than that of the interpreter: the ext diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py index fe4a2994e3b0cd..4894fcadb15eeb 100644 --- a/Lib/distutils/tests/test_sysconfig.py +++ b/Lib/distutils/tests/test_sysconfig.py @@ -126,7 +126,7 @@ def test_sysconfig_module(self): @unittest.skipIf(sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'), 'compiler flags customized') def test_sysconfig_compiler_vars(self): - # On OS X, binary installers support extension module building on + # On macOS, binary installers support extension module building on # various levels of the operating system with differing Xcode # configurations. This requires customization of some of the # compiler configuration directives to suit the environment on diff --git a/Lib/distutils/tests/test_unixccompiler.py b/Lib/distutils/tests/test_unixccompiler.py index efba27e1c8a0ab..30f5075c0c1265 100644 --- a/Lib/distutils/tests/test_unixccompiler.py +++ b/Lib/distutils/tests/test_unixccompiler.py @@ -110,7 +110,7 @@ def gcv(v): sysconfig.get_config_var = gcv self.assertEqual(self.cc.rpath_foo(), '-R/foo') - @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for OS X') + @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for macOS') def test_osx_cc_overrides_ldshared(self): # Issue #18080: # ensure that setting CC env variable also changes default linker @@ -125,7 +125,7 @@ def gcv(v): sysconfig.customize_compiler(self.cc) self.assertEqual(self.cc.linker_so[0], 'my_cc') - @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for OS X') + @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for macOS') def test_osx_explicit_ldshared(self): # Issue #18080: # ensure that setting CC env variable does not change diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py index 3f321c28dc3b41..a9112dc30992ac 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py @@ -225,7 +225,7 @@ def runtime_library_dir_option(self, dir): # we use this hack. compiler = os.path.basename(sysconfig.get_config_var("CC")) if sys.platform[:6] == "darwin": - # MacOSX's linker doesn't understand the -R flag at all + # macOS's linker doesn't understand the -R flag at all return "-L" + dir elif sys.platform[:7] == "freebsd": return "-Wl,-rpath=" + dir diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index fdcf6fabae2bc7..a83570bc5f5d9a 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -59,7 +59,7 @@ def get_platform (): if os.name != "posix" or not hasattr(os, 'uname'): # XXX what about the architecture? NT is Intel or Alpha, - # Mac OS is M68k or PPC, etc. + # macOS is M68k or PPC, etc. return sys.platform # Try to distinguish various flavours of Unix @@ -140,7 +140,7 @@ def change_root (new_root, pathname): """Return 'pathname' with 'new_root' prepended. If 'pathname' is relative, this is equivalent to "os.path.join(new_root,pathname)". Otherwise, it requires making 'pathname' relative and then joining the - two, which is tricky on DOS/Windows and Mac OS. + two, which is tricky on DOS/Windows and macOS. """ if os.name == 'posix': if not os.path.isabs(pathname): diff --git a/Lib/encodings/mac_greek.py b/Lib/encodings/mac_greek.py index d3d0c4f0c38755..aae3e4be2a1e9a 100644 --- a/Lib/encodings/mac_greek.py +++ b/Lib/encodings/mac_greek.py @@ -201,7 +201,7 @@ def getregentry(): '\xf4' # 0x99 -> LATIN SMALL LETTER O WITH CIRCUMFLEX '\xf6' # 0x9A -> LATIN SMALL LETTER O WITH DIAERESIS '\xa6' # 0x9B -> BROKEN BAR - '\u20ac' # 0x9C -> EURO SIGN # before Mac OS 9.2.2, was SOFT HYPHEN + '\u20ac' # 0x9C -> EURO SIGN # before macOS 9.2.2, was SOFT HYPHEN '\xf9' # 0x9D -> LATIN SMALL LETTER U WITH GRAVE '\xfb' # 0x9E -> LATIN SMALL LETTER U WITH CIRCUMFLEX '\xfc' # 0x9F -> LATIN SMALL LETTER U WITH DIAERESIS @@ -300,7 +300,7 @@ def getregentry(): '\u03cb' # 0xFC -> GREEK SMALL LETTER UPSILON WITH DIALYTIKA '\u0390' # 0xFD -> GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS '\u03b0' # 0xFE -> GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS - '\xad' # 0xFF -> SOFT HYPHEN # before Mac OS 9.2.2, was undefined + '\xad' # 0xFF -> SOFT HYPHEN # before macOS 9.2.2, was undefined ) ### Encoding table diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index a3fc5012fb3014..b2a55d79a52b41 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -25,7 +25,7 @@ What's New in IDLE 3.6.0? - Issue #27621: Put query response validation error messages in the query box itself instead of in a separate massagebox. Redo tests to match. - Add Mac OSX refinements. Original patch by Mark Roseman. + Add macOS refinements. Original patch by Mark Roseman. - Issue #27620: Escape key now closes Query box as cancelled. @@ -75,7 +75,7 @@ What's New in IDLE 3.6.0? Fix code and tests that fail with this restriction. Fix htests to not create a second and redundant root and mainloop. -- Issue #27310: Fix IDLE.app failure to launch on OS X due to vestigial import. +- Issue #27310: Fix IDLE.app failure to launch on macOS due to vestigial import. - Issue #5124: Paste with text selected now replaces the selection on X11. This matches how paste works on Windows, Mac, most modern Linux apps, @@ -214,7 +214,7 @@ What's New in IDLE 3.6.0? Patch by Mark Roseman. - Issue #25173: Associate tkinter messageboxes with a specific widget. - For Mac OSX, make them a 'sheet'. Patch by Mark Roseman. + For macOS, make them a 'sheet'. Patch by Mark Roseman. - Issue #25198: Enhance the initial html viewer now used for Idle Help. * Properly indent fixed-pitch text (patch by Mark Roseman). @@ -343,7 +343,7 @@ What's New in IDLE 3.5.0? - Issue #21284: Paragraph reformat test passes after user changes reformat width. -- Issue #17654: Ensure IDLE menus are customized properly on OS X for +- Issue #17654: Ensure IDLE menus are customized properly on macOS for non-framework builds and for all variants of Tk. @@ -361,7 +361,7 @@ What's New in IDLE 3.4.0? - Issue #16226: Fix IDLE Path Browser crash. (Patch by Roger Serwy) -- Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu +- Issue #15853: Prevent IDLE crash on macOS when opening Preferences menu with certain versions of Tk 8.5. Initial patch by Kevin Walzer. @@ -376,7 +376,7 @@ What's New in IDLE 3.3.0? - Issue #15318: Prevent writing to sys.stdin. - Issue #4832: Modify IDLE to save files with .py extension by - default on Windows and OS X (Tk 8.5) as it already does with X11 Tk. + default on Windows and macOS (Tk 8.5) as it already does with X11 Tk. - Issue #13532, #15319: Check that arguments to sys.stdout.write are strings. @@ -404,8 +404,8 @@ What's New in IDLE 3.3.0? - Issue #3573: IDLE hangs when passing invalid command line args (directory(ies) instead of file(s)). -- Issue #14018: Update checks for unstable system Tcl/Tk versions on OS X - to include versions shipped with OS X 10.7 and 10.8 in addition to 10.6. +- Issue #14018: Update checks for unstable system Tcl/Tk versions on macOS + to include versions shipped with macOS 10.7 and 10.8 in addition to 10.6. What's New in IDLE 3.2.1? diff --git a/Lib/idlelib/NEWS2x.txt b/Lib/idlelib/NEWS2x.txt index 6751ca5f111b18..1cf8c3a5fd30e9 100644 --- a/Lib/idlelib/NEWS2x.txt +++ b/Lib/idlelib/NEWS2x.txt @@ -105,7 +105,7 @@ What's New in IDLE 2.6 - Clean up EditorWindow close. -- Patch 1693258: Fix for duplicate "preferences" menu-OS X. Backport of r56204. +- Patch 1693258: Fix for duplicate "preferences" menu-macOS. Backport of r56204. - OSX: Avoid crash for those versions of Tcl/Tk which don't have a console @@ -169,10 +169,10 @@ What's New in IDLE 1.2? - Bug #1525817: Don't truncate short lines in IDLE's tool tips. -- Bug #1517990: IDLE keybindings on MacOS X now work correctly +- Bug #1517990: IDLE keybindings on macOS now work correctly - Bug #1517996: IDLE now longer shows the default Tk menu when a - path browser, class browser or debugger is the frontmost window on MacOS X + path browser, class browser or debugger is the frontmost window on macOS - EditorWindow.test() was failing. Bug 1417598 diff --git a/Lib/idlelib/config.py b/Lib/idlelib/config.py index 358bee4803b0c1..ebfa6919cb2b56 100644 --- a/Lib/idlelib/config.py +++ b/Lib/idlelib/config.py @@ -558,12 +558,12 @@ def GetCurrentKeySet(self): result = self.GetKeySet(self.CurrentKeys()) if sys.platform == "darwin": - # OS X Tk variants do not support the "Alt" keyboard modifier. + # macOS 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. + # in default macOS KeySets. for k, v in result.items(): v2 = [ x.replace('>', self.close_event) - # Some OS X systems have only one mouse button, so use + # Some macOS systems have only one mouse button, so use # control-click for popup context menus there. For two # buttons, AquaTk defines <2> as the right button, not <3>. text.bind("",self.right_menu_event) @@ -1589,7 +1589,7 @@ def prepstr(s): def get_accelerator(keydefs, eventname): keylist = keydefs.get(eventname) - # issue10940: temporary workaround to prevent hang with OS X Cocoa Tk 8.5 + # issue10940: temporary workaround to prevent hang with macOS Cocoa Tk 8.5 # if not keylist: if (not keylist) or (macosx.isCocoaTk() and eventname in { "<>", diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index ffc03c4112f073..d1c7b47097d827 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -96,7 +96,7 @@

Navigation

IDLE has the following features: