bpo-41203: Replace OS X with macOS #21316

pxeger · 2020-07-04T10:02:34Z

I've made separate commits for changes in old whatsnew files because maybe they should be kept as is, for historical reasons?

Also I've committed changes from "Macintosh" to "Mac".

All of these changes were made with sed so I can't guarantee there are no false-positives, although I tried...

https://bugs.python.org/issue41203

the-knights-who-say-ni · 2020-07-04T10:02:38Z

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

CLA Missing

Our records indicate the following people have not signed the CLA:

@pxeger

For legal reasons we need all the people listed to sign the CLA before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

If you have recently signed the CLA, please wait at least one business day
before our records are updated.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

ronaldoussoren

I'm generally in favour of this change, with some reservations:

I'd like to keep using "Macintosh" to refer to Mac systems before Darwin (Mac OS 9 and earlier)
There are changes to the various NEWS file, I'm not sure if this is a good idea. As far as I know we usually don't edit these.

There's also a number of incorrect changes (see detailed comments).

I haven't reviewed the change to the PDF file.

ronaldoussoren · 2020-07-04T10:36:48Z

Doc/distutils/setupscript.rst

@@ -675,7 +675,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 :: MacmacOS',


This one is incorrect for two reasons:

Spelling error in the new text

This value is a PyPI classifier, and those still use "MacOS X"

Please revert this change until "macOS" is added as an alternatieve to the PyPI classifiers.

ronaldoussoren · 2020-07-04T10:38:20Z

Doc/glossary.rst

@@ -1118,7 +1118,7 @@ Glossary
   universal newlines
      A manner of interpreting text streams in which all of the following are
      recognized as ending a line: the Unix end-of-line convention ``'\n'``,
-      the Windows convention ``'\r\n'``, and the old Macintosh convention
+      the Windows convention ``'\r\n'``, and the old Mac convention


I'd prefer to keep Macintosh here. This is referring to MacOS 9 and earlier, when Macintosh was commonly used to describe the system.

ronaldoussoren · 2020-07-04T10:38:38Z

Doc/library/binascii.rst

@@ -211,7 +211,7 @@ The :mod:`binascii` module defines the following functions:
      and 85.

   Module :mod:`binhex`
-      Support for the binhex format used on the Macintosh.
+      Support for the binhex format used on the Mac.


Same here, I'd prefer to keep Macintosh.

ronaldoussoren · 2020-07-04T10:39:30Z

Doc/library/binhex.rst

-If you code or decode textfiles on non-Macintosh platforms they will still use
-the old Macintosh newline convention (carriage-return as end of line).
+If you code or decode textfiles on non-Mac platforms they will still use
+the old Mac newline convention (carriage-return as end of line).


Likewise (for both lines).

ronaldoussoren · 2020-07-04T10:40:01Z

Doc/library/codecs.rst

@@ -1201,7 +1201,7 @@ particular, the following variants typically exist:
 | mac_latin2      | maclatin2, maccentraleurope,   | Central and Eastern Europe     |
 |                 | mac_centeuro                   |                                |
 +-----------------+--------------------------------+--------------------------------+
-| mac_roman       | macroman, macintosh            | Western Europe                 |
+| mac_roman       | macroman, Mac                  | Western Europe                 |


"macintosh" is the name of an encoding, don't change.

ronaldoussoren · 2020-07-04T10:42:23Z

Doc/reference/lexical_analysis.rst

@@ -50,7 +50,7 @@ A physical line is a sequence of characters terminated by an end-of-line
 sequence.  In source files and strings, any of the standard platform line
 termination sequences can be used - the Unix form using ASCII LF (linefeed),
 the Windows form using the ASCII sequence CR LF (return followed by linefeed),
-or the old Macintosh form using the ASCII CR (return) character.  All of these
+or the old Mac form using the ASCII CR (return) character.  All of these


I'd prefer to keep the name "Macintosh" here as well.

ronaldoussoren · 2020-07-04T10:43:14Z

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/MacmacOS; initial support for it is in Python 2.0.


Typo, this should be "macOS" instead of "MacmacOS".

ronaldoussoren · 2020-07-04T10:43:31Z

Doc/whatsnew/2.0.rst

@@ -773,7 +773,7 @@ the 'patches' and 'python-dev' lists at python.org.

 Recent versions of the GUSI development environment for MacOS support POSIX
 threads.  Therefore, Python's POSIX threading support now works on the
-Macintosh.  Threading support using the user-space GNU ``pth`` library was also
+Mac.  Threading support using the user-space GNU ``pth`` library was also


Don't change.

ronaldoussoren · 2020-07-04T10:43:45Z

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: MacmacOS (by Steven Majewski), Cygwin (by


ronaldoussoren · 2020-07-04T10:43:53Z

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 MacmacOS.


bedevere-bot · 2020-07-04T10:47:00Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

pxeger · 2020-07-04T10:56:05Z

RE changes to the NEWS files, I totally agree (especially the older ones) - it looks a bit anachronistic to have macOS references in the same breath as talking about Mac OS 9 and Macintosh. That's why I did them in separate commits, so it would be easier to cherrypick/rebase/whatever if they weren't wanted. Should I completely reset them?

…d Macs

pxeger · 2020-07-04T12:13:02Z

I have made the requested changes; please review again

bedevere-bot · 2020-07-04T12:13:05Z

Thanks for making the requested changes!

@ronaldoussoren: please review the changes made to this pull request.

serhiy-storchaka

Do not use anachronical macOS for versions which predated the name macOS.

serhiy-storchaka · 2020-07-04T12:00:50Z

Doc/library/binhex.rst

@@ -11,7 +11,7 @@
 --------------

 This module encodes and decodes files in binhex4 format, a format allowing
-representation of Macintosh files in ASCII. Only the data fork is handled.
+representation of Mac files in ASCII. Only the data fork is handled.


Same as above.

serhiy-storchaka · 2020-07-04T12:04:42Z

Doc/library/ctypes.rst

@@ -1420,7 +1420,7 @@ correct library and dependencies are loaded.
 .. data:: DEFAULT_MODE
   :noindex:

-   The default mode which is used to load shared libraries.  On OSX 10.3, this is
+   The default mode which is used to load shared libraries.  On macOS 10.3, this is


It was Mac OS X for versions up to 10.7 inclusively.

serhiy-storchaka · 2020-07-04T12:10:45Z

Doc/library/os.rst

@@ -301,7 +301,7 @@ process and user.

   .. note::

-      On Mac OS X, :func:`getgroups` behavior differs somewhat from
+      On macOS, :func:`getgroups` behavior differs somewhat from


I have doubts about this one. If the note refers to 10.5 and earlier, it should be Mac OS X.

serhiy-storchaka · 2020-07-04T12:12:17Z

Doc/library/os.rst

@@ -486,7 +486,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


Same as above.

serhiy-storchaka · 2020-07-04T12:15:58Z

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.


Is it relevant to modern macOS or only to classic MacOS?

serhiy-storchaka · 2020-07-04T12:31:42Z

Doc/using/mac.rst

@@ -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


It was Mac OS X.

Current versions of macOS still have Python 2.7 I believe

serhiy-storchaka · 2020-07-04T12:34:52Z

Doc/using/mac.rst

@@ -148,10 +148,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 https://www.wxpython.org.
+macOS. Packages and documentation are available from https://www.wxpython.org.

 *PyQt* is another popular cross-platform GUI toolkit that runs natively on Mac


Fix Mac macOS.

"Mac macOS" -> "macOS"

serhiy-storchaka · 2020-07-04T12:37:19Z

Doc/whatsnew/2.2.rst


  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


Do not change a cite.

serhiy-storchaka · 2020-07-04T12:39:00Z

Doc/whatsnew/2.2.rst

  left commented out in :file:`setup.py`.  People who want to experiment with
  these modules can uncomment them manually.

  .. Jack's original comments:
     The main change is the possibility to build Python as a
     framework. This installs a self-contained Python installation plus the
-     OSX framework "glue" into /Library/Frameworks/Python.framework (or
+     macOS framework "glue" into /Library/Frameworks/Python.framework (or


Same as above.

serhiy-storchaka · 2020-07-04T12:39:59Z

Doc/whatsnew/2.3.rst

@@ -375,7 +375,7 @@ PEP 278: Universal Newline Support
 ==================================

 The three major operating systems used today are Microsoft Windows, Apple's
-Macintosh OS, and the various Unix derivatives.  A minor irritation of
+Mac OS, and the various Unix derivatives.  A minor irritation of


Do not change.

serhiy-storchaka

There are incorrect changes. My comments have not yet been addressed.

bedevere-bot · 2020-07-20T13:01:39Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

And if you don't make the requested changes, you will be put in the comfy chair!

pxeger · 2020-07-20T14:31:46Z

I have made the requested changes; please review again

bedevere-bot · 2020-07-20T14:31:49Z

Thanks for making the requested changes!

@ronaldoussoren, @serhiy-storchaka: please review the changes made to this pull request.

serhiy-storchaka · 2021-07-25T20:00:18Z

Doc/library/platform.rst

@@ -232,13 +232,13 @@ Windows Platform
   .. versionadded:: 3.8


-Mac OS Platform
+macOS Platform
 ---------------


The length of the underlying line should be corrected.

serhiy-storchaka · 2021-07-25T20:01:44Z

Doc/library/site.rst

@@ -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 Macintosh).  For each
+:file:`lib/python{X.Y}/site-packages` (on Unix and Mac).  For each


serhiy-storchaka · 2021-07-25T20:03:00Z

Doc/library/site.rst

@@ -187,7 +187,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


serhiy-storchaka · 2021-07-25T20:09:39Z

Doc/library/urllib.request.rst

@@ -164,8 +164,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 ``<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 macOS System


On Apple's site it is called just "System Configuration".

serhiy-storchaka · 2021-07-25T20:11:11Z

Doc/library/urllib.request.rst

-   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.


I think it is just "the System Configuration framework".

serhiy-storchaka · 2021-07-25T20:12:25Z

Doc/using/mac.rst

@@ -2,13 +2,13 @@
 .. _using-on-mac:

 ***************************
-Using Python on a Macintosh
+Using Python on a Mac


The number of *s should match the length of the title.

serhiy-storchaka · 2021-07-25T20:15:17Z

Doc/using/mac.rst

@@ -2,13 +2,13 @@
 .. _using-on-mac:

 ***************************
-Using Python on a Macintosh
+Using Python on a Mac


According to Wikipedia "Mac" is a correct name for modern Apple's computers.

serhiy-storchaka · 2021-07-25T20:18:31Z

Doc/using/mac.rst

@@ -148,10 +148,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 https://www.wxpython.org.
+macOS. Packages and documentation are available from https://www.wxpython.org.

 *PyQt* is another popular cross-platform GUI toolkit that runs natively on Mac


"Mac macOS" -> "macOS"

pxeger added 4 commits July 4, 2020 10:31

(bpo-41203) change OS X -> macOS

1ecbddf

(bpo-41203) OS X -> macOS in old whatsnew/* files

732f353

(bpo-41203) Macintosh -> Mac

3c955c2

(bpo-41203) Macintosh -> Mac in old whatsnew/* files

447925a

pxeger requested review from berkerpeksag and tiran as code owners July 4, 2020 10:02

the-knights-who-say-ni added the CLA not signed label Jul 4, 2020

bedevere-bot added the awaiting review label Jul 4, 2020

pxeger added 2 commits July 4, 2020 11:19

(bpo-41203) docs: fix table formatting

98dca78

add news entry

04af2d3

ronaldoussoren requested changes Jul 4, 2020

View reviewed changes

bedevere-bot added awaiting changes and removed awaiting review labels Jul 4, 2020

fix some errors in mac -> macintosh and OSX -> macOS conversion

c119eb6

pxeger added 2 commits July 4, 2020 13:09

revert all changes to historic whatsnew files

721a670

revert binhex macintosh renames as it is a module specifically for ol…

a3b7b9b

…d Macs

bedevere-bot added awaiting change review and removed awaiting changes labels Jul 4, 2020

bedevere-bot requested a review from ronaldoussoren July 4, 2020 12:13

serhiy-storchaka reviewed Jul 4, 2020

View reviewed changes

csabella removed the CLA not signed label Jul 20, 2020

the-knights-who-say-ni added the CLA signed label Jul 20, 2020

csabella requested review from serhiy-storchaka and ronaldoussoren and removed request for ronaldoussoren July 20, 2020 11:36

serhiy-storchaka requested changes Jul 20, 2020

View reviewed changes

bedevere-bot added awaiting changes and removed awaiting change review labels Jul 20, 2020

make requested changes re OS X -> macOS

b8fb110

bedevere-bot added awaiting change review and removed awaiting changes labels Jul 20, 2020

bedevere-bot requested a review from serhiy-storchaka July 20, 2020 14:31

tiran removed their request for review April 18, 2021 09:17

vstinner closed this May 3, 2021

vstinner deleted the branch python:master May 3, 2021 21:29

serhiy-storchaka mentioned this pull request Jul 25, 2021

DOC: replace "Mac OS X" -> "macOS" #27345

Closed

serhiy-storchaka reviewed Jul 25, 2021

View reviewed changes

serhiy-storchaka mentioned this pull request Sep 22, 2021

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

Merged

bpo-41203: Replace OS X with macOS #21316

bpo-41203: Replace OS X with macOS #21316

Conversation

pxeger commented Jul 4, 2020 • edited by bedevere-bot Loading

the-knights-who-say-ni commented Jul 4, 2020

CLA Missing

ronaldoussoren left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bedevere-bot commented Jul 4, 2020

pxeger commented Jul 4, 2020

pxeger commented Jul 4, 2020

bedevere-bot commented Jul 4, 2020

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

serhiy-storchaka Jul 4, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

serhiy-storchaka left a comment

Choose a reason for hiding this comment

bedevere-bot commented Jul 20, 2020

pxeger commented Jul 20, 2020

bedevere-bot commented Jul 20, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pxeger commented Jul 4, 2020 •

edited by bedevere-bot

Loading

serhiy-storchaka Jul 4, 2020 •

edited

Loading