Skip to content

Commit

Permalink
Merge pull request python-pillow#7814 from hugovk/docs-rm-warnings
Browse files Browse the repository at this point in the history
Remove outdated installation warnings
  • Loading branch information
aclark4life authored Feb 24, 2024
2 parents 5830396 + f11ff46 commit ee37c63
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 9 deletions.
24 changes: 24 additions & 0 deletions docs/deprecations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -504,3 +504,27 @@ PIL.OleFileIO
the upstream :pypi:`olefile` Python package, and replaced with an :py:exc:`ImportError` in 5.0.0
(2018-01). The deprecated file has now been removed from Pillow. If needed, install from
PyPI (eg. ``python3 -m pip install olefile``).

import _imaging
~~~~~~~~~~~~~~~

.. versionremoved:: 2.1.0

Pillow >= 2.1.0 no longer supports ``import _imaging``.
Please use ``from PIL.Image import core as _imaging`` instead.

Pillow and PIL
~~~~~~~~~~~~~~

Pillow and PIL cannot co-exist in the same environment.
Before installing Pillow, please uninstall PIL.

.. versionremoved:: 1.0.0

import Image
~~~~~~~~~~~~

.. versionremoved:: 1.0.0

Pillow >= 1.0 no longer supports ``import Image``.
Please use ``from PIL import Image`` instead.
9 changes: 0 additions & 9 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@ Installation
});
</script>

Warnings
--------

.. warning:: Pillow and PIL cannot co-exist in the same environment. Before installing Pillow, please uninstall PIL.

.. warning:: Pillow >= 1.0 no longer supports ``import Image``. Please use ``from PIL import Image`` instead.

.. warning:: Pillow >= 2.1.0 no longer supports ``import _imaging``. Please use ``from PIL.Image import core as _imaging`` instead.

Python Support
--------------

Expand Down

0 comments on commit ee37c63

Please sign in to comment.