python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-25 17:36:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2125 from radarhere/macos

Browse Source 
Renamed references to OS X to macOS
This commit is contained in:
wiredfool 2016-09-25 09:31:01 +01:00 committed by GitHub
commit 21d1fd6be0
14 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -32,7 +32,7 @@ install:
# Coverage 4.0 doesn't support Python 3.2 # Coverage 4.0 doesn't support Python 3.2
- if [ "$TRAVIS_PYTHON_VERSION" == "3.2" ]; then travis_retry pip install coverage==3.7.1; fi - if [ "$TRAVIS_PYTHON_VERSION" == "3.2" ]; then travis_retry pip install coverage==3.7.1; fi
- if [ "$TRAVIS_PYTHON_VERSION" != "3.2" ]; then travis_retry pip install coverage; fi - if [ "$TRAVIS_PYTHON_VERSION" != "3.2" ]; then travis_retry pip install coverage; fi
# docs only on python 2.7 # docs only on python 2.7
- if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then travis_retry pip install -r requirements.txt ; fi - if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then travis_retry pip install -r requirements.txt ; fi
@ -94,8 +94,8 @@ after_success:
export $(cat .to_export_back) export $(cat .to_export_back)
if [ "$BUILD_LEADER" = "YES" ]; then if [ "$BUILD_LEADER" = "YES" ]; then
if [ "$BUILD_AGGREGATE_STATUS" = "others_succeeded" ]; then if [ "$BUILD_AGGREGATE_STATUS" = "others_succeeded" ]; then
echo "All jobs succeded! Triggering OS X build..." echo "All jobs succeded! Triggering macOS build..."
# Trigger an OS X build at the pillow-wheels repo # Trigger a macOS build at the pillow-wheels repo
./build_children.sh ./build_children.sh
else else
echo "Some jobs failed" echo "Some jobs failed"

4
CHANGES.rst
View File

@ -13,7 +13,7 @@ Changelog (Pillow)
- Added append_images parameter to GIF saving #2103 - Added append_images parameter to GIF saving #2103
[radarhere] [radarhere]
- Speedup paste with masks up to 80% #2015 - Speedup paste with masks up to 80% #2015
[homm] [homm]
- Rewrite DDS decoders in C, add DXT3 and BC7 decoders #2068 - Rewrite DDS decoders in C, add DXT3 and BC7 decoders #2068
@ -112,7 +112,7 @@ Changelog (Pillow)
- Added CMYK mode for opening EPS files #1826 - Added CMYK mode for opening EPS files #1826
[radarhere] [radarhere]
- Docs: OSX build instruction clarification #1994 - Docs: OS X build instruction clarification #1994
[wiredfool] [wiredfool]
- Docs: Filter comparison table #1993 - Docs: Filter comparison table #1993

6
PIL/IcnsImagePlugin.py
View File

@ -2,7 +2,7 @@
# The Python Imaging Library. # The Python Imaging Library.
# $Id$ # $Id$
# #
# Mac OS X icns file decoder, based on icns.py by Bob Ippolito. # macOS icns file decoder, based on icns.py by Bob Ippolito.
# #
# history: # history:
# 2004-10-09 fl Turned into a PIL plugin; removed 2.3 dependencies. # 2004-10-09 fl Turned into a PIL plugin; removed 2.3 dependencies.
@ -302,9 +302,9 @@ def _save(im, fp, filename):
""" """
Saves the image as a series of PNG files, Saves the image as a series of PNG files,
that are then converted to a .icns file that are then converted to a .icns file
using the OS X command line utility 'iconutil'. using the macOS command line utility 'iconutil'.
OS X only. macOS only.
""" """
if hasattr(fp, "flush"): if hasattr(fp, "flush"):
fp.flush() fp.flush()

2
PIL/Image.py
View File

@ -1725,7 +1725,7 @@ class Image(object):
PPM file, and calls either the **xv** utility or the **display** PPM file, and calls either the **xv** utility or the **display**
utility, depending on which one can be found. utility, depending on which one can be found.
On OS X, this method saves the image to a temporary BMP file, and opens On macOS, this method saves the image to a temporary BMP file, and opens
it with the native Preview application. it with the native Preview application.
On Windows, it saves the image to a temporary BMP file, and uses On Windows, it saves the image to a temporary BMP file, and uses

4
PIL/ImageGrab.py
View File

@ -2,7 +2,7 @@
# The Python Imaging Library # The Python Imaging Library
# $Id$ # $Id$
# #
# screen grabber (OS X and Windows only) # screen grabber (macOS and Windows only)
# #
# History: # History:
# 2001-04-26 fl created # 2001-04-26 fl created
@ -19,7 +19,7 @@ from PIL import Image
import sys import sys
if sys.platform not in ["win32", "darwin"]: if sys.platform not in ["win32", "darwin"]:
raise ImportError("ImageGrab is OS X and Windows only") raise ImportError("ImageGrab is macOS and Windows only")
if sys.platform == "win32": if sys.platform == "win32":
grabber = Image.core.grabscreen grabber = Image.core.grabscreen

6
README.rst
View File

@ -14,7 +14,7 @@ Pillow is the friendly PIL fork by `Alex Clark and Contributors <https://github.
* - docs * - docs
- |docs| - |docs|
* - tests * - tests
- | |linux| |osx| |windows| |coverage| |health| - | |linux| |macos| |windows| |coverage| |health|
* - package * - package
- |zenodo| |version| |downloads| - |zenodo| |version| |downloads|
@ -26,9 +26,9 @@ Pillow is the friendly PIL fork by `Alex Clark and Contributors <https://github.
:target: https://travis-ci.org/python-pillow/Pillow :target: https://travis-ci.org/python-pillow/Pillow
:alt: Travis CI build status (Linux) :alt: Travis CI build status (Linux)
.. |osx| image:: https://img.shields.io/travis/python-pillow/pillow-wheels/latest.svg?label=OS%20X%20build .. |macos| image:: https://img.shields.io/travis/python-pillow/pillow-wheels/latest.svg?label=OS%20X%20build
:target: https://travis-ci.org/python-pillow/pillow-wheels :target: https://travis-ci.org/python-pillow/pillow-wheels
:alt: Travis CI build status (OS X) :alt: Travis CI build status (macOS)
.. |windows| image:: https://img.shields.io/appveyor/ci/python-pillow/Pillow/master.svg?label=Windows%20build .. |windows| image:: https://img.shields.io/appveyor/ci/python-pillow/Pillow/master.svg?label=Windows%20build
:target: https://ci.appveyor.com/project/python-pillow/Pillow :target: https://ci.appveyor.com/project/python-pillow/Pillow

6
RELEASING.md
View File

@ -88,8 +88,8 @@ Released as needed privately to individual vendors for critical security-related
* [ ] Contact @cgohlke for Windows binaries via release ticket e.g. https://github.com/python-pillow/Pillow/issues/1174. * [ ] Contact @cgohlke for Windows binaries via release ticket e.g. https://github.com/python-pillow/Pillow/issues/1174.
* [ ] Download and extract tarball from @cgohlke and ``twine upload *``. * [ ] Download and extract tarball from @cgohlke and ``twine upload *``.
### OS X ### macOS
* [ ] Use the [Pillow OS X Wheel Builder](https://github.com/python-pillow/pillow-wheels): * [ ] Use the [Pillow macOS Wheel Builder](https://github.com/python-pillow/pillow-wheels):
``` ```
$ git checkout https://github.com/python-pillow/pillow-wheels $ git checkout https://github.com/python-pillow/pillow-wheels
$ cd pillow-wheels $ cd pillow-wheels
@ -100,7 +100,7 @@ Released as needed privately to individual vendors for critical security-related
$ git commit -a -m "Pillow -> 2.9.0" $ git commit -a -m "Pillow -> 2.9.0"
$ git push $ git push
``` ```
* [ ] Download distributions from the [Pillow OS X Wheel Builder container](http://cdf58691c5cf45771290-6a3b6a0f5f6ab91aadc447b2a897dd9a.r50.cf2.rackcdn.com/) and ``twine upload *``. * [ ] Download distributions from the [Pillow macOS Wheel Builder container](http://cdf58691c5cf45771290-6a3b6a0f5f6ab91aadc447b2a897dd9a.r50.cf2.rackcdn.com/) and ``twine upload *``.
### Linux ### Linux

2
Tests/test_file_tiff.py
View File

@ -40,7 +40,7 @@ class TestFileTiff(PillowTestCase):
im = Image.open(filename) im = Image.open(filename)
def test_mac_tiff(self): def test_mac_tiff(self):
# Read RGBa images from Mac OS X [@PIL136] # Read RGBa images from macOS [@PIL136]
filename = "Tests/images/pil136.tiff" filename = "Tests/images/pil136.tiff"
im = Image.open(filename) im = Image.open(filename)

2
Tests/test_imagefont.py
View File

@ -422,7 +422,7 @@ try:
@unittest.skipIf(sys.platform.startswith('win32'), @unittest.skipIf(sys.platform.startswith('win32'),
"requires Unix or MacOS") "requires Unix or MacOS")
def test_find_osx_font(self): def test_find_macos_font(self):
# Like the linux test, more cover hitting code rather than testing # Like the linux test, more cover hitting code rather than testing
# correctness. # correctness.
font_directory = '/System/Library/Fonts' font_directory = '/System/Library/Fonts'

2
Tests/test_imagegrab.py
View File

@ -42,7 +42,7 @@ class TestImageGrabImport(PillowTestCase):
else: else:
self.assertIsInstance(exception, ImportError) self.assertIsInstance(exception, ImportError)
self.assertEqual(str(exception), self.assertEqual(str(exception),
"ImageGrab is OS X and Windows only") "ImageGrab is macOS and Windows only")
if __name__ == '__main__': if __name__ == '__main__':

2
docs/handbook/image-file-formats.rst
View File

@ -133,7 +133,7 @@ attributes before loading the file::
ICNS ICNS
^^^^ ^^^^
PIL reads and (OS X only) writes Mac OS X ``.icns`` files. By default, the PIL reads and (macOS only) writes macOS ``.icns`` files. By default, the
largest available icon is read, though you can override this by setting the largest available icon is read, though you can override this by setting the
:py:attr:`~PIL.Image.Image.size` property before calling :py:attr:`~PIL.Image.Image.size` property before calling
:py:meth:`~PIL.Image.Image.load`. The :py:meth:`~PIL.Image.Image.open` method :py:meth:`~PIL.Image.Image.load`. The :py:meth:`~PIL.Image.Image.open` method

2
docs/index.rst
View File

@ -16,7 +16,7 @@ Pillow is the friendly PIL fork by `Alex Clark and Contributors <https://github.
.. image:: https://travis-ci.org/python-pillow/pillow-wheels.svg?branch=latest .. image:: https://travis-ci.org/python-pillow/pillow-wheels.svg?branch=latest
:target: https://travis-ci.org/python-pillow/pillow-wheels :target: https://travis-ci.org/python-pillow/pillow-wheels
:alt: Travis CI build status (OS X) :alt: Travis CI build status (macOS)
.. image:: https://img.shields.io/appveyor/ci/python-pillow/Pillow/master.svg?label=Windows%20build .. image:: https://img.shields.io/appveyor/ci/python-pillow/Pillow/master.svg?label=Windows%20build
:target: https://ci.appveyor.com/project/python-pillow/Pillow :target: https://ci.appveyor.com/project/python-pillow/Pillow

12
docs/installation.rst
View File

@ -28,7 +28,7 @@ Basic Installation
.. note:: .. note::
The basic installation works on Windows and OS X using the binaries The basic installation works on Windows and macOS using the binaries
from PyPI. Other installations require building from source as from PyPI. Other installations require building from source as
detailed below. detailed below.
@ -58,11 +58,11 @@ or::
> easy_install Pillow > easy_install Pillow
OS X Installation macOS Installation
^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^
We provide binaries for OS X for each of the supported Python versions We provide binaries for macOS for each of the supported Python versions
in the wheel format. These include support for all optional libraries in the wheel format. These include support for all optional libraries
except OpenJPEG:: except OpenJPEG::
$ pip install Pillow $ pip install Pillow
@ -230,7 +230,7 @@ or using pip::
$ pip install pillow --global-option="build_ext" --global-option="--enable-[feature]" $ pip install pillow --global-option="build_ext" --global-option="--enable-[feature]"
Building on OS X Building on macOS
^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^
The Xcode command line tools are required to compile portions of The Xcode command line tools are required to compile portions of
@ -326,7 +326,7 @@ Platform Support
Current platform support for Pillow. Binary distributions are contributed for Current platform support for Pillow. Binary distributions are contributed for
each release on a volunteer basis, but the source should compile and run each release on a volunteer basis, but the source should compile and run
everywhere platform support is listed. In general, we aim to support all everywhere platform support is listed. In general, we aim to support all
current versions of Linux, OS X, and Windows. current versions of Linux, macOS, and Windows.
.. note:: .. note::

10
docs/reference/ImageGrab.rst
View File

@ -1,23 +1,23 @@
.. py:module:: PIL.ImageGrab .. py:module:: PIL.ImageGrab
.. py:currentmodule:: PIL.ImageGrab .. py:currentmodule:: PIL.ImageGrab
:py:mod:`ImageGrab` Module (OS X and Windows only) :py:mod:`ImageGrab` Module (macOS and Windows only)
================================================== ==================================================
The :py:mod:`ImageGrab` module can be used to copy the contents of the screen The :py:mod:`ImageGrab` module can be used to copy the contents of the screen
or the clipboard to a PIL image memory. or the clipboard to a PIL image memory.
.. note:: The current version works on OS X and Windows only. .. note:: The current version works on macOS and Windows only.
.. versionadded:: 1.1.3 .. versionadded:: 1.1.3
.. py:function:: PIL.ImageGrab.grab(bbox=None) .. py:function:: PIL.ImageGrab.grab(bbox=None)
Take a snapshot of the screen. The pixels inside the bounding box are Take a snapshot of the screen. The pixels inside the bounding box are
returned as an "RGB" image on Windows or "RGBA" on OS X. returned as an "RGB" image on Windows or "RGBA" on macOS.
If the bounding box is omitted, the entire screen is copied. If the bounding box is omitted, the entire screen is copied.
.. versionadded:: 1.1.3 (Windows), 3.0.0 (OS X) .. versionadded:: 1.1.3 (Windows), 3.0.0 (macOS)
:param bbox: What region to copy. Default is the entire screen. :param bbox: What region to copy. Default is the entire screen.
:return: An image :return: An image
@ -26,7 +26,7 @@ or the clipboard to a PIL image memory.
Take a snapshot of the clipboard image, if any. Take a snapshot of the clipboard image, if any.
.. versionadded:: 1.1.4 (Windows), 3.3.0 (OS X) .. versionadded:: 1.1.4 (Windows), 3.3.0 (macOS)
:return: On Windows, an image, a list of filenames, :return: On Windows, an image, a list of filenames,
or None if the clipboard does not contain image data or filenames. or None if the clipboard does not contain image data or filenames.