Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed whole Mac OS X's to macOS #58

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Doc/c-api/init.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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``.
Expand Down
2 changes: 1 addition & 1 deletion Doc/distributing/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Doc/distutils/apiref.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Expand Down Expand Up @@ -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
Expand All @@ -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``

Expand Down
2 changes: 1 addition & 1 deletion Doc/distutils/builtdist.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Doc/distutils/setupscript.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion Doc/extending/extending.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions Doc/faq/gui.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ install (since it comes included with most
`binary distributions <https://www.python.org/downloads/>`_ of Python) and use.
For more info about Tk, including pointers to the source, see the
`Tcl/Tk home page <https://www.tcl.tk>`_. 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.

Expand Down Expand Up @@ -113,7 +113,7 @@ What platform-specific GUI toolkits exist for Python?
========================================================

By installing the `PyObjc Objective-C bridge
<https://pythonhosted.org/pyobjc/>`_, Python programs can use Mac OS X's
<https://pythonhosted.org/pyobjc/>`_, Python programs can use macOS's
Cocoa libraries.

:ref:`Pythonwin <windows-faq>` by Mark Hammond includes an interface to the
Expand Down
2 changes: 1 addition & 1 deletion Doc/faq/installed.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion Doc/howto/unicode.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Doc/install/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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"):

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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:

+--------------+----------------------------------------------------------+-------+
Expand Down
6 changes: 3 additions & 3 deletions Doc/installing/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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``::

Expand Down Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions Doc/library/asyncio-eventloops.rst
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,18 @@ configuration. See :ref:`asyncio delayed calls <asyncio-delayed-calls>`.
:class:`ProactorEventLoop` now supports SSL.


Mac OS X
macOS
^^^^^^^^

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the underline should be fixed here.


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
Expand Down
2 changes: 1 addition & 1 deletion Doc/library/asyncio-protocol.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Doc/library/ctypes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down Expand Up @@ -80,7 +80,7 @@ the library by creating an instance of CDLL by calling the constructor::
<CDLL 'libc.so.6', handle ... at ...>
>>>

.. XXX Add section for Mac OS X.
.. XXX Add section for macOS.


.. _ctypes-accessing-functions-from-loaded-dlls:
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Doc/library/idle.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Doc/library/macpath.rst
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
:mod:`macpath` --- Mac OS 9 path manipulation functions
:mod:`macpath` --- macOS 9 path manipulation functions
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

macOS 9 is OK?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@methane i think it's fine, isn't you?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what is Apple's definition. Is there any resource from Apple?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@methane Apple called mac OS 9 but there is no source on their website now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://en.wikipedia.org/wiki/MacOS

"OS X" was renamed macOS. But no information about classic "Mac OS".

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@methane okey, I'm changing back old Mac OS's.

=======================================================

.. 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`,
Expand Down
2 changes: 1 addition & 1 deletion Doc/library/mmap.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`::

Expand Down
6 changes: 3 additions & 3 deletions Doc/library/multiprocessing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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])
Expand Down Expand Up @@ -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::
Expand Down
2 changes: 1 addition & 1 deletion Doc/library/os.path.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading