Skip to content

Commit

Permalink
OS X -> MacOS
Browse files Browse the repository at this point in the history
  • Loading branch information
ask committed Jun 14, 2016
1 parent 3e93215 commit 5b40db2
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
Fix contributed by Tin Tvrtkovic.

- Now uses ``ctypes.find_library`` instead of hardcoded path to find
the OS X CoreServices framework.
the macOS CoreServices framework.

Fix contributed by Moritz Kassner.

Expand Down Expand Up @@ -233,7 +233,7 @@
- Includes many changes from multiprocessing in 3.4.

- Now uses ``time.monotonic`` when available, also including
fallback implementations for Linux and OS X.
fallback implementations for Linux and macOS.

- No longer cleans up after receiving SIGILL, SIGSEGV or SIGFPE

Expand Down
6 changes: 3 additions & 3 deletions Doc/library/multiprocessing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ For an example of the usage of queues for interprocess communication see
multithreading/multiprocessing semantics, this number is not reliable.

Note that this may raise :exc:`NotImplementedError` on Unix platforms like
Mac OS X where ``sem_getvalue()`` is not implemented.
macOS where ``sem_getvalue()`` is not implemented.

.. method:: empty()

Expand Down Expand Up @@ -887,7 +887,7 @@ object -- see :ref:`multiprocessing-managers`.

A bounded semaphore object: a clone of :class:`threading.BoundedSemaphore`.

(On Mac OS X, this is indistinguishable from :class:`Semaphore` because
(On macOS, this is indistinguishable from :class:`Semaphore` because
``sem_getvalue()`` is not implemented on that platform).

.. class:: Condition([lock])
Expand Down Expand Up @@ -924,7 +924,7 @@ object -- see :ref:`multiprocessing-managers`.

.. note::

On Mac OS X, ``sem_timedwait`` is unsupported, so calling ``acquire()`` with
On macOS, ``sem_timedwait`` is unsupported, so calling ``acquire()`` with
a timeout will emulate that function's behavior using a sleeping loop.

.. note::
Expand Down
6 changes: 3 additions & 3 deletions INSTALL.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Windows binary builds for Python 2.4 and Python 2.5 are available at

http://pypi.python.org/pypi/multiprocessing

Python 2.6 and newer versions already come with multiprocessing. Although
Python 2.6 and newer versions already come with multiprocessing. Although
the stand alone variant of the multiprocessing package is kept compatible
with 2.6, you mustn't install it with Python 2.6.

Expand All @@ -27,7 +27,7 @@ distribution can be installed the usual way::
python setup.py install

It should not be necessary to do any editing of `setup.py` if you are
using Windows, Mac OS X or Linux. On other unices it may be necessary
using Windows, macOS or Linux. On other unices it may be necessary
to modify the values of the `macros` dictionary or `libraries` list.
The section to modify reads ::

Expand Down Expand Up @@ -81,7 +81,7 @@ Building docs
-------------

To build the standalone documentation you need Sphinx 0.5 and setuptools
0.6c9 or newer. Both are available at http://pypi.python.org/. With
0.6c9 or newer. Both are available at http://pypi.python.org/. With
setuptools installed, do ::

sudo easy_install-2.5 "Sphinx>=0.5"
Expand Down
2 changes: 1 addition & 1 deletion Modules/_billiard/semaphore.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Billiard_semlock_release(BilliardSemLockObject *self, PyObject *args)
#define SEM_GETVALUE(sem, pval) sem_getvalue(sem, pval)
#define SEM_UNLINK(name) sem_unlink(name)

/* OS X 10.4 defines SEM_FAILED as -1 instead (sem_t *)-1; this gives
/* macOS 10.4 defines SEM_FAILED as -1 instead (sem_t *)-1; this gives
compiler warnings, and (potentially) undefined behavior. */
#ifdef __APPLE__
# undef SEM_FAILED
Expand Down
2 changes: 1 addition & 1 deletion billiard/queues.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def get(self, block=True, timeout=None):
return ForkingPickler.loads(res)

def qsize(self):
# Raises NotImplementedError on Mac OSX because
# Raises NotImplementedError on macOS because
# of broken sem_getvalue()
return self._maxsize - self._sem._semlock._get_value()

Expand Down
2 changes: 1 addition & 1 deletion billiard/reduction.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def detach(self):
__all__ += ['DupFd', 'sendfds', 'recvfds']
import array

# On MacOSX we should acknowledge receipt of fds -- see Issue14669
# On macOS we should acknowledge receipt of fds -- see Issue14669
ACKNOWLEDGE = sys.platform == 'darwin'

def sendfds(sock, fds):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def add_doc(m):
if sys.platform == 'win32': # Windows
macros = dict()
libraries = ['ws2_32']
elif sys.platform.startswith('darwin'): # Mac OSX
elif sys.platform.startswith('darwin'): # macOS
macros = dict(
HAVE_SEM_OPEN=1,
HAVE_SEM_TIMEDWAIT=0,
Expand Down

0 comments on commit 5b40db2

Please sign in to comment.