From 3daabaa2648ff59ff346aff559b28ed91313539a Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 22 Apr 2018 22:00:39 +0300 Subject: [PATCH] PILLOW_VERSION will be removed in a future release --- docs/releasenotes/5.2.0.rst | 4 ++-- src/PIL/Image.py | 4 +++- src/PIL/__init__.py | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/releasenotes/5.2.0.rst b/docs/releasenotes/5.2.0.rst index 6fc22ffdef4..b93c78328ca 100644 --- a/docs/releasenotes/5.2.0.rst +++ b/docs/releasenotes/5.2.0.rst @@ -7,8 +7,8 @@ API Changes Deprecations ^^^^^^^^^^^^ -These version constants have been deprecated and will be removed in the next -major release: +These version constants have been deprecated. ``VERSION`` will be removed in +Pillow 6.0.0, and ``PILLOW_VERSION`` will be removed in a future release. * ``PIL.VERSION`` (old PIL version 1.1.7) * ``PIL.PILLOW_VERSION`` diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 0b9c52899de..87cfc5a0273 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -24,7 +24,9 @@ # See the README file for information on usage and redistribution. # -# PILLOW_VERSION and VERSION are deprecated and will be removed in Pillow 6.0.0. Use __version__ instead. +# VERSION is deprecated and will be removed in Pillow 6.0.0. +# PILLOW_VERSION is deprecated and will be removed in a future release. +# Use __version__ instead. from . import VERSION, PILLOW_VERSION, __version__, _plugins from ._util import py3 diff --git a/src/PIL/__init__.py b/src/PIL/__init__.py index 7b8f0595f1d..5806a217464 100644 --- a/src/PIL/__init__.py +++ b/src/PIL/__init__.py @@ -13,7 +13,9 @@ from . import _version -# PILLOW_VERSION and VERSION are deprecated and will be removed in Pillow 6.0.0. Use __version__ instead. +# VERSION is deprecated and will be removed in Pillow 6.0.0. +# PILLOW_VERSION is deprecated and will be removed in a future release. +# Use __version__ instead. VERSION = '1.1.7' # PIL Version PILLOW_VERSION = __version__ = _version.__version__