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 #4107 from hugovk/rm-deprecated-PILLOW_VERSION

Browse Source 
Remove deprecated PILLOW_VERSION
This commit is contained in:
Andrew Murray 2019-10-03 20:52:48 +10:00 committed by GitHub
commit f61af2fed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/deprecations.rst
View File

@ -94,14 +94,6 @@ a ``DeprecationWarning``:
Setting the size of a TIFF image directly is deprecated, and will
be removed in a future version. Use the resize method instead.
PILLOW_VERSION constant
~~~~~~~~~~~~~~~~~~~~~~~
.. deprecated:: 5.2.0
``PILLOW_VERSION`` has been deprecated and will be removed in 7.0.0. Use ``__version__``
instead.
ImageCms.CmsProfile attributes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -128,6 +120,13 @@ Removed features
Deprecated features are only removed in major releases after an appropriate
period of deprecation has passed.
PILLOW_VERSION constant
~~~~~~~~~~~~~~~~~~~~~~~
*Removed in version 7.0.0.*
``PILLOW_VERSION`` has been removed. Use ``__version__`` instead.
VERSION constant
~~~~~~~~~~~~~~~~

7
src/PIL/Image.py
View File

@ -35,9 +35,9 @@ import sys
import warnings
# VERSION was removed in Pillow 6.0.0.
# PILLOW_VERSION is deprecated and will be removed in Pillow 7.0.0.
# PILLOW_VERSION was removed in Pillow 7.0.0.
# Use __version__ instead.
from . import PILLOW_VERSION, ImageMode, TiffTags, __version__, _plugins
from . import ImageMode, TiffTags, __version__, _plugins
from ._binary import i8, i32le
from ._util import deferred_error, isPath, isStringType, py3
@ -57,9 +57,6 @@ except ImportError:
from collections import Callable, MutableMapping
# Silence warning
assert PILLOW_VERSION
logger = logging.getLogger(__name__)

4
src/PIL/__init__.py
View File

@ -17,9 +17,9 @@ PIL.VERSION is the old PIL version and will be removed in the future.
from . import _version
# VERSION was removed in Pillow 6.0.0.
# PILLOW_VERSION is deprecated and will be removed in Pillow 7.0.0.
# PILLOW_VERSION was removed in Pillow 7.0.0.
# Use __version__ instead.
PILLOW_VERSION = __version__ = _version.__version__
__version__ = _version.__version__
del _version