8000 bpo-41203: Replace Mac OS X and OS X with macOS by serhiy-storchaka · Pull Request #28515 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

bpo-41203: Replace Mac OS X and OS X with macOS #28515

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

Merged
merged 2 commits into from
Sep 22, 2021
Merged
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
Prev Previous commit
Address my comments.
  • Loading branch information
serhiy-storchaka committed Sep 22, 2021
commit 74b33ac48047ce93e0f4f8174f85264d5d9e0c58
2 changes: 1 addition & 1 deletion Doc/library/platform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ Windows Platform


macOS Platform
---------------
--------------


.. function:: mac_ver(release='', versioninfo=('','',''), machine='')
Expand Down
6 changes: 3 additions & 3 deletions Doc/library/site.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ It starts by constructing up to four directories from a head and a tail part.
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 Mac). 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.
Expand Down Expand Up @@ -177,7 +177,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
macOS builds, :file:`~/Library/Python/{X.Y}/lib/python/site-packages` for Mac
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.
Expand All @@ -188,7 +188,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 macOS non-framework builds,
:file:`~/Library/Python/{X.Y}` for Mac framework builds, and
: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>`.
Expand Down
4 changes: 2 additions & 2 deletions Doc/library/urllib.request.rst
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ 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 ``<scheme>_proxy``,
in a case insensitive approach, for all operating systems first, and when it
cannot find it, looks for proxy information from macOS System
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.< 106A9 /td>
Expand Down Expand Up @@ -304,7 +304,7 @@ The following classes are provided:
``<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 macOS environment proxy information
is retrieved from the macOS System Configuration Framework.
is retrieved from the System Configuration Framework.

To disable autodetected proxy pass an empty dictionary.

Expand Down
8 changes: 4 additions & 4 deletions Doc/using/mac.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

.. _using-on-mac:

***************************
*********************
Using Python on a Mac
***************************
*********************

:Author: Bob Savage <bobsavage@mac.com>

Expand All @@ -17,7 +17,7 @@ the IDE and the Package Manager that are worth pointing out.
Getting and Installing MacPython
================================

macOS 10.8 comes with Python 2.7 pre-installed by Apple. If you wish, you
macOS since version 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
Expand Down Expand Up @@ -150,7 +150,7 @@ https://www.activestate.com; it can also be built from source.
*wxPython* is another popular cross-platform GUI toolkit that runs natively on
macOS. Packages and documentation are available from https://www.wxpython.org.

*PyQt* is another popular cross-platform GUI toolkit that runs natively on Mac
*PyQt* is another popular cross-platform GUI toolkit that runs natively on
macOS. More information can be found at
https://riverbankcomputing.com/software/pyqt/intro.

Expand Down
0