python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-11 17:56:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move warnings to docs

Browse Source
This commit is contained in:
Alex Clark 2013-10-15 08:47:10 -04:00
parent 539f1463cc
commit 08ac59e33c
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.rst
View File

@ -23,14 +23,6 @@ details, and more.
Introduction Introduction
------------ ------------
.. Note:: Pillow < 2.0.0 supports Python versions 2.4, 2.5, 2.6, 2.7; Pillow >= 2.0.0 supports Python versions 2.6, 2.7, 3.2, 3.3.
.. Note:: Pillow >= 2.1.0 no longer supports "import _imaging". Please use "from PIL.Image import core as _imaging" instead.
.. Note:: Pillow >= 1.0 no longer supports "import Image". Please use "from PIL import Image" instead.
.. Note:: PIL and Pillow currently cannot co-exist in the same environment. If you want to use Pillow, please remove PIL first.
The fork author's goal is to foster active development of PIL through: The fork author's goal is to foster active development of PIL through:
- Continuous integration testing via `Travis CI <https://travis-ci.org/python-imaging/Pillow>`_ - Continuous integration testing via `Travis CI <https://travis-ci.org/python-imaging/Pillow>`_

6
docs/installation.rst
View File

@ -4,6 +4,12 @@ Installation
.. warning:: PIL and Pillow currently cannot co-exist in the same environment. .. warning:: PIL and Pillow currently cannot co-exist in the same environment.
If you want to use Pillow, please remove PIL first. If you want to use Pillow, please remove PIL first.
.. warning:: Pillow < 2.0.0 supports Python versions 2.4, 2.5, 2.6, 2.7; Pillow >= 2.0.0 supports Python versions 2.6, 2.7, 3.2, 3.3.
.. warning:: Pillow >= 2.1.0 no longer supports "import _imaging". Please use "from PIL.Image import core as _imaging" instead.
.. warning:: Pillow >= 1.0 no longer supports "import Image". Please use "from PIL import Image" instead.
Simple installation Simple installation
------------------- -------------------