From 1ecbddf0576a81934f2160e9cab589684f3a5cbd Mon Sep 17 00:00:00 2001 From: pxeger <_@pxeger.com> Date: Sat, 4 Jul 2020 10:31:29 +0100 Subject: [PATCH 01/10] (bpo-41203) change OS X -> macOS --- Doc/c-api/init.rst | 6 +++--- Doc/distributing/index.rst | 2 +- Doc/distutils/apiref.rst | 8 ++++---- Doc/distutils/setupscript.rst | 2 +- Doc/extending/extending.rst | 2 +- Doc/faq/gui.rst | 6 +++--- Doc/faq/installed.rst | 2 +- Doc/install/index.rst | 8 ++++---- Doc/installing/index.rst | 6 +++--- Doc/library/ctypes.rst | 8 ++++---- Doc/library/intro.rst | 2 +- Doc/library/mmap.rst | 2 +- Doc/library/multiprocessing.rst | 6 +++--- Doc/library/os.rst | 14 +++++++------- Doc/library/othergui.rst | 6 +++--- Doc/library/platform.rst | 6 +++--- Doc/library/profile.rst | 2 +- Doc/library/select.rst | 4 ++-- Doc/library/shutil.rst | 2 +- Doc/library/site.rst | 4 ++-- Doc/library/socket.rst | 2 +- Doc/library/sqlite3.rst | 2 +- Doc/library/ssl.rst | 2 +- Doc/library/stat.rst | 6 +++--- Doc/library/sysconfig.rst | 4 ++-- Doc/library/test.rst | 4 ++-- Doc/library/tkinter.ttk.rst | 2 +- Doc/library/turtle-star.pdf | Bin 4418 -> 4415 bytes Doc/library/urllib.request.rst | 8 ++++---- Doc/library/webbrowser.rst | 2 +- Doc/license.rst | 2 +- Doc/tutorial/appetite.rst | 2 +- Doc/using/cmdline.rst | 4 ++-- Doc/using/mac.rst | 16 ++++++++-------- 34 files changed, 77 insertions(+), 77 deletions(-) diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst index 68fed2acc447ee..9c68b6043a1d6f 100644 --- a/Doc/c-api/init.rst +++ b/Doc/c-api/init.rst @@ -448,7 +448,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 @@ -469,7 +469,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 to the program @@ -510,7 +510,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 02379946244d84..04a7bcfc0ab3dc 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 b14197c2f94dba..fadce73843c055 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -373,7 +373,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. @@ -1119,11 +1119,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 @@ -1132,7 +1132,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/setupscript.rst b/Doc/distutils/setupscript.rst index 4386a60b664bfb..f0fc9e30e6dfb0 100644 --- a/Doc/distutils/setupscript.rst +++ b/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', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', 'Programming Language :: Python', diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst index 25dc2934d29ef6..2c070dd557f5c1 100644 --- a/Doc/extending/extending.rst +++ b/Doc/extending/extending.rst @@ -914,7 +914,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 781da467d18013..ca496ef5574928 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. @@ -104,7 +104,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/install/index.rst b/Doc/install/index.rst index e6d5a3e6ebde60..9a19b58b242c5c 100644 --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -199,7 +199,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"): @@ -229,7 +229,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 @@ -305,7 +305,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 @@ -728,7 +728,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 31e9b0bde07244..5e7e03045b2acc 100644 --- a/Doc/installing/index.rst +++ b/Doc/installing/index.rst @@ -84,7 +84,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 @@ -163,7 +163,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``:: @@ -225,7 +225,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/ctypes.rst b/Doc/library/ctypes.rst index 2d6c6d0a1c3c57..c51df7fc15f172 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: @@ -1288,7 +1288,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 @@ -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 *RTLD_GLOBAL*, otherwise it is the same as *RTLD_LOCAL*. Instances of these classes have no public methods. Functions exported by the diff --git a/Doc/library/intro.rst b/Doc/library/intro.rst index 8567e4d1d08920..5bb33b9c10cc03 100644 --- a/Doc/library/intro.rst +++ b/Doc/library/intro.rst @@ -58,5 +58,5 @@ Notes on availability 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 698c17653786b3..96f6d96a065c69 100644 --- a/Doc/library/mmap.rst +++ b/Doc/library/mmap.rst @@ -102,7 +102,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 08258a65a89dc3..b884639d69a174 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -782,7 +782,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() @@ -1232,7 +1232,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]) @@ -1371,7 +1371,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.rst b/Doc/library/os.rst index 275b2d390e7cf5..532937065098ee 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -126,7 +126,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`. @@ -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 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; @@ -448,7 +448,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`. .. audit-event:: os.putenv key,value os.putenv @@ -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 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(). @@ -1295,11 +1295,11 @@ or `the MSDN `_ on Windo On Linux, if *offset* is given as ``None``, the bytes are read from the current position of *in_fd* and the position of *in_fd* 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_fd* 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_fd* is reached. All platforms support sockets as *out_fd* file descriptor, and some platforms @@ -2667,7 +2667,7 @@ features: 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/othergui.rst b/Doc/library/othergui.rst index 48c1f2754111aa..db11933b325f39 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:: @@ -26,7 +26,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. @@ -40,7 +40,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 8e8e3775aaff4a..5288a9c60e20a0 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 @@ -232,13 +232,13 @@ Windows Platform .. 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 34525a96f55c43..cd4748c1a9102b 100644 --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -622,7 +622,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.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 a354187c266c7f..a8f5a7b7d5fb93 100644 --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -534,7 +534,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 | @@ -626,7 +626,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 1b094aeb9ca3d8..1635eed7a9c3b9 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 b424e1ba348d87..a66d892bdad5db 100644 --- a/Doc/library/site.rst +++ b/Doc/library/site.rst @@ -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 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. @@ -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 :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/socket.rst b/Doc/library/socket.rst index d798c1a9d10a05..7a6e6cba23c1d5 100755 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -506,7 +506,7 @@ Constants .. 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 ccb82278bdaa13..36051ca24cd9d3 100644 --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -1107,7 +1107,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 852091c02ec9a4..d05331003b34a0 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 f48a0a9faa6b0c..98219eaee97619 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/sysconfig.rst b/Doc/library/sysconfig.rst index 78a1dfce9ae05c..978ea04906b89b 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 @@ -188,7 +188,7 @@ Other functions - 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 cd05ef07b4a212..58e312cc055f1c 100644 --- a/Doc/library/test.rst +++ b/Doc/library/test.rst @@ -684,8 +684,8 @@ The :mod:`test.support` module defines the following functions: .. 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 6967d7509657b3..2614d2ad50f357 100644 --- a/Doc/library/tkinter.ttk.rst +++ b/Doc/library/tkinter.ttk.rst @@ -759,7 +759,7 @@ ones inherited from :class:`ttk.Widget`. Platform-specific notes ^^^^^^^^^^^^^^^^^^^^^^^ -* On MacOS X, toplevel windows automatically include a built-in size grip +* On MacmacOS, 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/turtle-star.pdf b/Doc/library/turtle-star.pdf index e354073dd42f5e6ea48118d7e2363247b190528b..f93fef50f304106c632c23aec974b2085520d21b 100644 GIT binary patch delta 18 ZcmX@4v|nk%Ek4%V#AN^A&5!sJm;g#h2Ri@& delta 21 ccmdn5bVzB#Ej|w4#AF5kV1_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. @@ -298,8 +298,8 @@ The following classes are provided: the list of proxies from the environment variables ``_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 b7bfb655a71579..86d370b090003f 100644 --- a/Doc/library/webbrowser.rst +++ b/Doc/library/webbrowser.rst @@ -169,7 +169,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 fa6d71a78042d1..c892b46e5a1164 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -621,7 +621,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 8c65d99ef31f9f..9fa557054aad33 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -615,7 +615,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 @@ -698,7 +698,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 ead71e1b079b3b..2a74e25280ada7 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 @@ -54,12 +54,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 @@ -87,7 +87,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. @@ -98,7 +98,7 @@ With Python 3.9, 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 @@ -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 -OS X. More information can be found at +macOS. More information can be found at https://riverbankcomputing.com/software/pyqt/intro. From 732f3537889f3537a313d878d2ed0077e4261f60 Mon Sep 17 00:00:00 2001 From: pxeger <_@pxeger.com> Date: Sat, 4 Jul 2020 10:35:17 +0100 Subject: [PATCH 02/10] (bpo-41203) OS X -> macOS in old whatsnew/* files --- Doc/whatsnew/2.0.rst | 2 +- Doc/whatsnew/2.1.rst | 2 +- Doc/whatsnew/2.2.rst | 8 ++++---- Doc/whatsnew/2.5.rst | 4 ++-- Doc/whatsnew/2.6.rst | 14 +++++++------- Doc/whatsnew/2.7.rst | 4 ++-- Doc/whatsnew/3.2.rst | 8 ++++---- Doc/whatsnew/3.3.rst | 2 +- Doc/whatsnew/3.4.rst | 6 +++--- Doc/whatsnew/3.5.rst | 2 +- Doc/whatsnew/3.7.rst | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst index ace396b9d846ab..ee7aead732d3c7 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/MacmacOS; 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 8b1eac968e2bc0..efe19ca58c752a 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: MacmacOS (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 b4cd4341f4be43..1a9a4d37228072 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 MacmacOS. 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,14 +1151,14 @@ 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. .. 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 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 it is the basis for diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst index 4e85abaea75535..191ec279919d33 100644 --- a/Doc/whatsnew/2.5.rst +++ b/Doc/whatsnew/2.5.rst @@ -2207,10 +2207,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 +* MacmacOS (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 +* MacmacOS: 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 b6174a19a178b6..ec0f99d8461589 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 d19c8e01ad8a00..8b10720eaf227e 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 @@ -2669,7 +2669,7 @@ the ``make install`` and ``make altinstall`` commands do not 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.2.rst b/Doc/whatsnew/3.2.rst index ca3eda05c515af..c2ef15dba7065d 100644 --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -2444,7 +2444,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 @@ -2498,7 +2498,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`.) @@ -2593,9 +2593,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 f1a033c6dae61f..3be88882b6c231 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 99d040840d9fb3..0859336c3c569b 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 @@ -1399,7 +1399,7 @@ The ``socket.AF_*`` and ``socket.SOCK_*`` constants are now enumeration values using the new :mod:`enum` module. This allows meaningful names to be printed during debugging, instead of integer "magic numbers". -The :data:`~socket.AF_LINK` constant is now available on BSD and OSX. +The :data:`~socket.AF_LINK` constant is now available on BSD and macOS. :func:`~socket.inet_pton` and :func:`~socket.inet_ntop` are now supported on Windows. (Contributed by Atsuo Ishimoto in :issue:`7171`.) @@ -2229,7 +2229,7 @@ Code Cleanups * The private and effectively unused ``_gestalt`` module has been removed, along with the private :mod:`platform` functions ``_mac_ver_lookup``, ``_mac_ver_gstalt``, and ``_bcd2str``, which would only have ever been called - on badly broken OSX systems (see :issue:`18393`). + on badly broken macOS systems (see :issue:`18393`). * The hardcoded copies of certain :mod:`stat` constants that were included in the :mod:`tarfile` module namespace have been removed. diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index b4540ac1dd9028..9a883aa8636414 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/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst index 59b96621bdd4b5..3873c76bbd0502 100644 --- a/Doc/whatsnew/3.7.rst +++ b/Doc/whatsnew/3.7.rst @@ -1748,7 +1748,7 @@ Support for building ``--without-threads`` has been removed. The (Contributed by Antoine Pitrou in :issue:`31370`.). A full copy of libffi is no longer bundled for use when building the -:mod:`_ctypes ` module on non-OSX UNIX platforms. An installed copy +:mod:`_ctypes ` module on non-macOS UNIX platforms. An installed copy of libffi is now required when building ``_ctypes`` on such platforms. (Contributed by Zachary Ware in :issue:`27979`.) From 3c955c218f39d8022e58ff748b9ef603a420efd1 Mon Sep 17 00:00:00 2001 From: pxeger <_@pxeger.com> Date: Sat, 4 Jul 2020 10:40:59 +0100 Subject: [PATCH 03/10] (bpo-41203) Macintosh -> Mac --- Doc/glossary.rst | 2 +- Doc/library/binascii.rst | 2 +- Doc/library/binhex.rst | 6 +++--- Doc/library/codecs.rst | 2 +- Doc/library/site.rst | 2 +- Doc/reference/lexical_analysis.rst | 2 +- Doc/using/mac.rst | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Doc/glossary.rst b/Doc/glossary.rst index e997d366777b38..4d09fdef24f26e 100644 --- a/Doc/glossary.rst +++ b/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 ``'\r'``. See :pep:`278` and :pep:`3116`, as well as :func:`bytes.splitlines` for an additional use. diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst index 2c0c1bce5d7f8f..38a007518088bc 100644 --- a/Doc/library/binascii.rst +++ b/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. Module :mod:`uu` Support for UU encoding used on Unix. diff --git a/Doc/library/binhex.rst b/Doc/library/binhex.rst index 7de6a663762f0c..d1389c807990e5 100644 --- a/Doc/library/binhex.rst +++ b/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. The :mod:`binhex` module defines the following functions: @@ -54,6 +54,6 @@ Notes There is an alternative, more powerful interface to the coder and decoder, see the source for details. -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). diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index f071057293eece..a42833bf52678d 100644 --- a/Doc/library/codecs.rst +++ b/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 | +-----------------+--------------------------------+--------------------------------+ | mac_turkish | macturkish | Turkish | +-----------------+--------------------------------+--------------------------------+ diff --git a/Doc/library/site.rst b/Doc/library/site.rst index a66d892bdad5db..01b083b95d4763 100644 --- a/Doc/library/site.rst +++ b/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 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. diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index 7d70cbcaa372ac..37e31e7b16c075 100644 --- a/Doc/reference/lexical_analysis.rst +++ b/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 forms can be used equally, regardless of platform. The end of input also serves as an implicit terminator for the final physical line. diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst index 2a74e25280ada7..63c695152d3164 100644 --- a/Doc/using/mac.rst +++ b/Doc/using/mac.rst @@ -2,13 +2,13 @@ .. _using-on-mac: *************************** -Using Python on a Macintosh +Using Python on a Mac *************************** :Author: Bob Savage -Python on a Macintosh running macOS is in principle very similar to Python on +Python on a Mac 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. From 447925abcda9442b808375bf80f0c7995f6c3037 Mon Sep 17 00:00:00 2001 From: pxeger <_@pxeger.com> Date: Sat, 4 Jul 2020 10:41:13 +0100 Subject: [PATCH 04/10] (bpo-41203) Macintosh -> Mac in old whatsnew/* files --- Doc/whatsnew/2.0.rst | 2 +- Doc/whatsnew/2.3.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst index ee7aead732d3c7..87ca88039740b8 100644 --- a/Doc/whatsnew/2.0.rst +++ b/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 contributed. Threading support on Windows was enhanced, too. Windows supports thread locks diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst index dac0e63649288a..7fb151d860c24d 100644 --- a/Doc/whatsnew/2.3.rst +++ b/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 cross-platform work is that these three platforms all use different characters to mark the ends of lines in text files. Unix uses the linefeed (ASCII character 10), MacOS uses the carriage return (ASCII character 13), and Windows uses a From 98dca783e599d0c398f61e4859669cf5faa6b846 Mon Sep 17 00:00:00 2001 From: pxeger <_@pxeger.com> Date: Sat, 4 Jul 2020 11:19:16 +0100 Subject: [PATCH 05/10] (bpo-41203) docs: fix table formatting --- Doc/library/codecs.rst | 2 +- Doc/library/select.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index a42833bf52678d..6229a1e6361c47 100644 --- a/Doc/library/codecs.rst +++ b/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, Mac | Western Europe | +| mac_roman | macroman, Mac | Western Europe | +-----------------+--------------------------------+--------------------------------+ | mac_turkish | macturkish | Turkish | +-----------------+--------------------------------+--------------------------------+ diff --git a/Doc/library/select.rst b/Doc/library/select.rst index a8f5a7b7d5fb93..46b5ff8b6d5863 100644 --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -534,7 +534,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 macOS] | + | | [not available on macOS] | +---------------------------+---------------------------------------------+ | :const:`KQ_FILTER_SIGNAL` | Returns whenever the watched signal is | | | delivered to the process | From 04af2d377c4e4c39f4dabbf01d557da2b03cc7cd Mon Sep 17 00:00:00 2001 From: pxeger <_@pxeger.com> Date: Sat, 4 Jul 2020 11:24:38 +0100 Subject: [PATCH 06/10] add news entry --- .../next/Documentation/2020-07-04-11-24-25.bpo-41203.uohyRX.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Documentation/2020-07-04-11-24-25.bpo-41203.uohyRX.rst diff --git a/Misc/NEWS.d/next/Documentation/2020-07-04-11-24-25.bpo-41203.uohyRX.rst b/Misc/NEWS.d/next/Documentation/2020-07-04-11-24-25.bpo-41203.uohyRX.rst new file mode 100644 index 00000000000000..6f776f8a2777c4 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-07-04-11-24-25.bpo-41203.uohyRX.rst @@ -0,0 +1 @@ +Replace references to OS X with macOS and Macintosh with Mac From c119eb68b16cf3d4179eebe9eb879552433d25eb Mon Sep 17 00:00:00 2001 From: pxeger <_@pxeger.com> Date: Sat, 4 Jul 2020 11:51:54 +0100 Subject: [PATCH 07/10] fix some errors in mac -> macintosh and OSX -> macOS conversion --- Doc/distutils/setupscript.rst | 2 +- Doc/glossary.rst | 2 +- Doc/library/binascii.rst | 2 +- Doc/library/binhex.rst | 4 ++-- Doc/library/codecs.rst | 2 +- Doc/reference/lexical_analysis.rst | 2 +- Doc/whatsnew/2.0.rst | 4 ++-- Doc/whatsnew/2.1.rst | 2 +- Doc/whatsnew/2.2.rst | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index f0fc9e30e6dfb0..4386a60b664bfb 100644 --- a/Doc/distutils/setupscript.rst +++ b/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 :: MacmacOS', + 'Operating System :: MacOS :: MacOS X', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', 'Programming Language :: Python', diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 4d09fdef24f26e..e997d366777b38 100644 --- a/Doc/glossary.rst +++ b/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 Mac convention + the Windows convention ``'\r\n'``, and the old Macintosh convention ``'\r'``. See :pep:`278` and :pep:`3116`, as well as :func:`bytes.splitlines` for an additional use. diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst index 38a007518088bc..2c0c1bce5d7f8f 100644 --- a/Doc/library/binascii.rst +++ b/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 Mac. + Support for the binhex format used on the Macintosh. Module :mod:`uu` Support for UU encoding used on Unix. diff --git a/Doc/library/binhex.rst b/Doc/library/binhex.rst index d1389c807990e5..947331aa0efce6 100644 --- a/Doc/library/binhex.rst +++ b/Doc/library/binhex.rst @@ -54,6 +54,6 @@ Notes There is an alternative, more powerful interface to the coder and decoder, see the source for details. -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). +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). diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index 6229a1e6361c47..f071057293eece 100644 --- a/Doc/library/codecs.rst +++ b/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, Mac | Western Europe | +| mac_roman | macroman, macintosh | Western Europe | +-----------------+--------------------------------+--------------------------------+ | mac_turkish | macturkish | Turkish | +-----------------+--------------------------------+--------------------------------+ diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index 37e31e7b16c075..7d70cbcaa372ac 100644 --- a/Doc/reference/lexical_analysis.rst +++ b/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 Mac form using the ASCII CR (return) character. All of these +or the old Macintosh form using the ASCII CR (return) character. All of these forms can be used equally, regardless of platform. The end of input also serves as an implicit terminator for the final physical line. diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst index 87ca88039740b8..02abc7a27246fb 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/MacmacOS; 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. @@ -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 -Mac. Threading support using the user-space GNU ``pth`` library was also +Macintosh. Threading support using the user-space GNU ``pth`` library was also contributed. Threading support on Windows was enhanced, too. Windows supports thread locks diff --git a/Doc/whatsnew/2.1.rst b/Doc/whatsnew/2.1.rst index efe19ca58c752a..9b4eb6627883a7 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: MacmacOS (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 1a9a4d37228072..166546aa517297 100644 --- a/Doc/whatsnew/2.2.rst +++ b/Doc/whatsnew/2.2.rst @@ -1137,7 +1137,7 @@ 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 MacmacOS. + 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 From 721a67099026fbb3f883cd0fb1ea6a154cf92a7c Mon Sep 17 00:00:00 2001 From: pxeger <_@pxeger.com> Date: Sat, 4 Jul 2020 13:09:13 +0100 Subject: [PATCH 08/10] revert all changes to historic whatsnew files --- Doc/whatsnew/2.0.rst | 2 +- Doc/whatsnew/2.1.rst | 2 +- Doc/whatsnew/2.2.rst | 8 ++++---- Doc/whatsnew/2.3.rst | 2 +- Doc/whatsnew/2.5.rst | 4 ++-- Doc/whatsnew/2.6.rst | 14 +++++++------- Doc/whatsnew/2.7.rst | 4 ++-- Doc/whatsnew/3.2.rst | 8 ++++---- Doc/whatsnew/3.3.rst | 2 +- Doc/whatsnew/3.4.rst | 6 +++--- Doc/whatsnew/3.5.rst | 2 +- Doc/whatsnew/3.7.rst | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst index 02abc7a27246fb..ace396b9d846ab 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; initial support for it is in Python 2.0. +Another new platform is Darwin/MacOS X; 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 9b4eb6627883a7..8b1eac968e2bc0 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 (by Steven Majewski), Cygwin (by +* Some new ports were contributed: MacOS X (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 166546aa517297..b4cd4341f4be43 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. + in the main Python CVS tree, and many changes have been made to support MacOS X. 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 macOS framework "glue" into + self-contained Python installation plus the OS X 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,14 +1151,14 @@ 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 macOS, but they've been + windowing, QuickTime, scripting, etc. have been ported to OS X, but they've been 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 - macOS framework "glue" into /Library/Frameworks/Python.framework (or + OSX framework "glue" into /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 it is the basis for diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst index 7fb151d860c24d..dac0e63649288a 100644 --- a/Doc/whatsnew/2.3.rst +++ b/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 -Mac OS, and the various Unix derivatives. A minor irritation of +Macintosh OS, and the various Unix derivatives. A minor irritation of cross-platform work is that these three platforms all use different characters to mark the ends of lines in text files. Unix uses the linefeed (ASCII character 10), MacOS uses the carriage return (ASCII character 13), and Windows uses a diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst index 191ec279919d33..4e85abaea75535 100644 --- a/Doc/whatsnew/2.5.rst +++ b/Doc/whatsnew/2.5.rst @@ -2207,10 +2207,10 @@ Changes to Python's build process and to the C API include: Port-Specific Changes --------------------- -* MacmacOS (10.3 and higher): dynamic loading of modules now uses the +* MacOS X (10.3 and higher): dynamic loading of modules now uses the :c:func:`dlopen` function instead of MacOS-specific functions. -* MacmacOS: an :option:`!--enable-universalsdk` switch was added to the +* MacOS X: 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 ec0f99d8461589..b6174a19a178b6 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 macOS: :file:`~/.local/` +* Unix and Mac OS X: :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/macOS and +such as :file:`lib/python2.6/site-packages` on Unix/Mac OS 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 macOS to +The ``.plist`` format is commonly used on Mac OS X 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 macOS, the format +Despite being primarily used on Mac OS X, 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 macOS, Python 2.6 can be compiled as a 4-way universal build. +* On Mac OS X, 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: macOS +Port-Specific Changes: Mac OS X ----------------------------------- * When compiling a framework build of Python, you can now specify the @@ -3154,7 +3154,7 @@ Port-Specific Changes: macOS :func:`macostools.touched` function to be removed because it depended on the :mod:`macfs` module. (:issue:`1490190`) -* Many other macOS modules have been deprecated and will be removed in +* Many other Mac OS 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 8b10720eaf227e..d19c8e01ad8a00 100644 --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -2359,7 +2359,7 @@ Port-Specific Changes: Windows .. ====================================================================== -Port-Specific Changes: macOS +Port-Specific Changes: Mac OS X ----------------------------------- * The path ``/Library/Python/2.7/site-packages`` is now appended to @@ -2669,7 +2669,7 @@ the ``make install`` and ``make altinstall`` commands do not bootstrap ``pip`` by default. This behaviour can be controlled through configure options, and overridden through Makefile options. -On Windows and macOS, the CPython installers now default to installing +On Windows and Mac OS X, 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.2.rst b/Doc/whatsnew/3.2.rst index c2ef15dba7065d..ca3eda05c515af 100644 --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -2444,7 +2444,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 macOS, Python decodes command line arguments with ``'utf-8'`` rather than +On Mac OS X, 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 @@ -2498,7 +2498,7 @@ IDLE (Contributed by Raymond Hettinger; :issue:`5150`.) -* IDLE on macOS now works with both Carbon AquaTk and Cocoa AquaTk. +* IDLE on Mac OS X now works with both Carbon AquaTk and Cocoa AquaTk. (Contributed by Kevin Walzer, Ned Deily, and Ronald Oussoren; :issue:`6075`.) @@ -2593,9 +2593,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 macOS build, see +Also, there were a number of updates to the Mac OS X 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 macOS 10.6. +build, there is a known problem with the default Tcl/Tk on Mac OS X 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 3be88882b6c231..f1a033c6dae61f 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 macOS. (Contributed by Michael Goderbauer in :issue:`13777`.) + family on OS X. (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 0859336c3c569b..99d040840d9fb3 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 macOS, the CPython installers now default to installing +On Windows and Mac OS X, 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 @@ -1399,7 +1399,7 @@ The ``socket.AF_*`` and ``socket.SOCK_*`` constants are now enumeration values using the new :mod:`enum` module. This allows meaningful names to be printed during debugging, instead of integer "magic numbers". -The :data:`~socket.AF_LINK` constant is now available on BSD and macOS. +The :data:`~socket.AF_LINK` constant is now available on BSD and OSX. :func:`~socket.inet_pton` and :func:`~socket.inet_ntop` are now supported on Windows. (Contributed by Atsuo Ishimoto in :issue:`7171`.) @@ -2229,7 +2229,7 @@ Code Cleanups * The private and effectively unused ``_gestalt`` module has been removed, along with the private :mod:`platform` functions ``_mac_ver_lookup``, ``_mac_ver_gstalt``, and ``_bcd2str``, which would only have ever been called - on badly broken macOS systems (see :issue:`18393`). + on badly broken OSX systems (see :issue:`18393`). * The hardcoded copies of certain :mod:`stat` constants that were included in the :mod:`tarfile` module namespace have been removed. diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index 9a883aa8636414..b4540ac1dd9028 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 macOS platforms, extension module filenames now end with ``-darwin.so``. +* On OS X 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/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst index 3873c76bbd0502..59b96621bdd4b5 100644 --- a/Doc/whatsnew/3.7.rst +++ b/Doc/whatsnew/3.7.rst @@ -1748,7 +1748,7 @@ Support for building ``--without-threads`` has been removed. The (Contributed by Antoine Pitrou in :issue:`31370`.). A full copy of libffi is no longer bundled for use when building the -:mod:`_ctypes ` module on non-macOS UNIX platforms. An installed copy +:mod:`_ctypes ` module on non-OSX UNIX platforms. An installed copy of libffi is now required when building ``_ctypes`` on such platforms. (Contributed by Zachary Ware in :issue:`27979`.) From a3b7b9b12fb88a9d3f518f04ef51d22247c30d20 Mon Sep 17 00:00:00 2001 From: pxeger <_@pxeger.com> Date: Sat, 4 Jul 2020 13:12:29 +0100 Subject: [PATCH 09/10] revert binhex macintosh renames as it is a module specifically for old Macs --- Doc/library/binhex.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/binhex.rst b/Doc/library/binhex.rst index 947331aa0efce6..7de6a663762f0c 100644 --- a/Doc/library/binhex.rst +++ b/Doc/library/binhex.rst @@ -11,7 +11,7 @@ -------------- This module encodes and decodes files in binhex4 format, a format allowing -representation of Mac files in ASCII. Only the data fork is handled. +representation of Macintosh files in ASCII. Only the data fork is handled. The :mod:`binhex` module defines the following functions: From b8fb1103158972fdc469e407433a112d179c56ae Mon Sep 17 00:00:00 2001 From: pxeger <_@pxeger.com> Date: Mon, 20 Jul 2020 15:28:49 +0100 Subject: [PATCH 10/10] make requested changes re OS X -> macOS --- Doc/library/ctypes.rst | 2 +- Doc/library/os.rst | 4 ++-- Doc/library/shutil.rst | 2 +- Doc/library/site.rst | 2 +- Doc/library/tkinter.ttk.rst | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst index c51df7fc15f172..4d11641ca3899c 100644 --- a/Doc/library/ctypes.rst +++ b/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 macOS 10.3, this is + The default mode which is used to load shared libraries. On OSX 10.3, this is *RTLD_GLOBAL*, otherwise it is the same as *RTLD_LOCAL*. Instances of these classes have no public methods. Functions exported by the diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 532937065098ee..174b5fa54846b8 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -301,7 +301,7 @@ process and user. .. note:: - On macOS, :func:`getgroups` behavior differs somewhat from + On Mac OS X, :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; @@ -486,7 +486,7 @@ process and user. .. availability:: Unix. - .. note:: On macOS, the length of *groups* may not exceed the + .. note:: On Mac OS X, 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(). diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index 1635eed7a9c3b9..1b094aeb9ca3d8 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 macOS, the resource fork and other metadata are not used. + as ACLs. On Mac OS, 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 01b083b95d4763..8b463f06c2b75d 100644 --- a/Doc/library/site.rst +++ b/Doc/library/site.rst @@ -176,7 +176,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 + :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 framework builds, and :file:`{%APPDATA%}\\Python\\Python{XY}\\site-packages` on Windows. This directory is a site directory, which means that diff --git a/Doc/library/tkinter.ttk.rst b/Doc/library/tkinter.ttk.rst index 2614d2ad50f357..2db4c0f9143f64 100644 --- a/Doc/library/tkinter.ttk.rst +++ b/Doc/library/tkinter.ttk.rst @@ -759,7 +759,7 @@ ones inherited from :class:`ttk.Widget`. Platform-specific notes ^^^^^^^^^^^^^^^^^^^^^^^ -* On MacmacOS, 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.