Merge pull request #4107 from hugovk/rm-deprecated-PILLOW_VERSION

Remove deprecated PILLOW_VERSION
python-pillow · Oct 3, 2019 · f61af2f · f61af2f
2 parents 59153f5 + f898ccb
commit f61af2f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/docs/deprecations.rst b/docs/deprecations.rst
@@ -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
 ~~~~~~~~~~~~~~~~
 

diff --git a/src/PIL/Image.py b/src/PIL/Image.py
@@ -35,9 +35,9 @@
 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 @@
     from collections import Callable, MutableMapping
 
 
-# Silence warning
-assert PILLOW_VERSION
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/src/PIL/__init__.py b/src/PIL/__init__.py
@@ -17,9 +17,9 @@
 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