bpo-41203: Replace Mac OS X and OS X with macOS (GH-28515) (GH-28523)
Replace old names when they refer to actual versions of macOS.
Keep historical names in references to older versions.
Co-authored-by: Patrick Reader <_@pxeger.com>
(cherry picked from commit 36122e18148c5b6c78ebce1d36d514fd7cf250f5)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
index fd6422c..b186f1d5 100644
--- a/Doc/library/ctypes.rst
+++ b/Doc/library/ctypes.rst
@@ -20,7 +20,7 @@
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 @@
<CDLL 'libc.so.6', handle ... at ...>
>>>
-.. XXX Add section for Mac OS X.
+.. XXX Add section for macOS.
.. _ctypes-accessing-functions-from-loaded-dlls:
@@ -1288,7 +1288,7 @@
'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/intro.rst b/Doc/library/intro.rst
index 8567e4d..5bb33b9 100644
--- a/Doc/library/intro.rst
+++ b/Doc/library/intro.rst
@@ -58,5 +58,5 @@
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.
diff --git a/Doc/library/mmap.rst b/Doc/library/mmap.rst
index d9825b4..da17475 100644
--- a/Doc/library/mmap.rst
+++ b/Doc/library/mmap.rst
@@ -102,7 +102,7 @@
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 57df899..3d78ad3 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -783,7 +783,7 @@
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()
@@ -1235,7 +1235,7 @@
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])
@@ -1374,7 +1374,7 @@
.. 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.rst b/Doc/library/os.rst
index f0f8119..237ca4b 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2789,7 +2789,7 @@
String that uniquely identifies the type of the filesystem that
contains the file.
- 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/platform.rst b/Doc/library/platform.rst
index bb9fc45..a0eece6 100644
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -225,13 +225,13 @@
.. versionadded:: 3.8
-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/profile.rst b/Doc/library/profile.rst
index 774d46d..cf324a5 100644
--- a/Doc/library/profile.rst
+++ b/Doc/library/profile.rst
@@ -622,7 +622,7 @@
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.process_time() as
+on a 1.8Ghz Intel Core i5 running macOS, and using Python's time.process_time() 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/select.rst b/Doc/library/select.rst
index a354187..46b5ff8 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -534,7 +534,7 @@
| :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 |
@@ -626,7 +626,7 @@
| :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/site.rst b/Doc/library/site.rst
index 2e3646f..e2ad3c4 100644
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -32,7 +32,7 @@
For the head part, it uses ``sys.prefix`` and ``sys.exec_prefix``; empty heads
are skipped. For the tail part, it uses the empty string and then
:file:`lib/site-packages` (on Windows) or
-:file:`lib/python{X.Y}/site-packages` (on Unix and Macintosh). For each
+:file:`lib/python{X.Y}/site-packages` (on Unix and macOS). For each
of the distinct head-tail combinations, it sees if it refers to an existing
directory, and if so, adds it to ``sys.path`` and also inspects the newly
added path for configuration files.
@@ -176,8 +176,8 @@
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
+ :file:`~/.local/lib/python{X.Y}/site-packages` for UNIX and non-framework
+ macOS builds, :file:`~/Library/Python/{X.Y}/lib/python/site-packages` for macOS
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.
@@ -187,8 +187,8 @@
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:`~/Library/Python/{X.Y}` for Mac framework builds, and
+ :file:`~/.local` for UNIX and macOS non-framework builds,
+ :file:`~/Library/Python/{X.Y}` for macOS 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,
etc. for the :ref:`user installation scheme <inst-alt-install-user>`.
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 1b6dc4d..3c81858 100755
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -516,7 +516,7 @@
.. data:: AF_LINK
- .. availability:: BSD, OSX.
+ .. availability:: BSD, macOS.
.. versionadded:: 3.4
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 172c5b7..d29e425 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1109,7 +1109,7 @@
.. 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 the
:option:`--enable-loadable-sqlite-extensions` option to configure.
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index b96dda4..4d75616 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 f48a0a9..98219ea 100644
--- a/Doc/library/stat.rst
+++ b/Doc/library/stat.rst
@@ -372,11 +372,11 @@
.. 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 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/sysconfig.rst b/Doc/library/sysconfig.rst
index 2de55d8..6327318 100644
--- a/Doc/library/sysconfig.rst
+++ b/Doc/library/sysconfig.rst
@@ -74,7 +74,7 @@
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
@@ -225,7 +225,7 @@
- win-amd64 (64bit Windows on AMD64, aka x86_64, Intel64, and EM64T)
- 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/test.rst b/Doc/library/test.rst
index 64d767e..a6cc2be 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -684,8 +684,8 @@
.. decorator:: requires_mac_version(*min_version)
- Decorator for the minimum version when running test on Mac OS X. If the
- MAC OS X version is less than the minimum, raise :exc:`unittest.SkipTest`.
+ Decorator for the minimum version when running test on macOS. If the
+ macOS version is less than the minimum, raise :exc:`unittest.SkipTest`.
.. decorator:: requires_IEEE_754
diff --git a/Doc/library/tkinter.ttk.rst b/Doc/library/tkinter.ttk.rst
index 6967d75..2db4c0f 100644
--- a/Doc/library/tkinter.ttk.rst
+++ b/Doc/library/tkinter.ttk.rst
@@ -759,7 +759,7 @@
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 dbb8c25..659a363 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -169,8 +169,8 @@
This helper function returns a dictionary of scheme to proxy server URL
mappings. It scans the environment for variables named ``<scheme>_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 System
+ Configuration for macOS and Windows Systems Registry for Windows.
If both lowercase and uppercase environment variables exist (and disagree),
lowercase is preferred.
@@ -303,8 +303,8 @@
the list of proxies from the environment variables
``<protocol>_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 System Configuration Framework.
To disable autodetected proxy pass an empty dictionary.
diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst
index 39a355c..c099088 100644
--- a/Doc/library/webbrowser.rst
+++ b/Doc/library/webbrowser.rst
@@ -169,7 +169,7 @@
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.