Merge 9f4ba9922d into 032027303f

Tests/test_000_sanity.py

@@ -11,8 +11,6 @@ class TestSanity(PillowTestCase):
         # Make sure we have the binary extension
         im = PIL.Image.core.new("L", (100, 100))
 
-        self.assertEqual(PIL.Image.VERSION[:3], '1.1')
-
         # Create an image and do stuff with it.
         im = PIL.Image.new("1", (100, 100))
         self.assertEqual((im.mode, im.size), ('1', (100, 100)))

Tests/test_pyroma.py

@@ -1,6 +1,6 @@
 from helper import unittest, PillowTestCase
 
-from PIL import PILLOW_VERSION
+from PIL import __version__
 
 try:
     import pyroma
@@ -26,7 +26,7 @@ class TestPyroma(PillowTestCase):
         rating = pyroma.ratings.rate(data)
 
         # Assert
-        if 'rc' in PILLOW_VERSION:
+        if 'rc' in __version__:
             # Pyroma needs to chill about RC versions
             # and not kill all our tests.
             self.assertEqual(rating, (9, [

docs/conf.py

@@ -53,9 +53,9 @@ author = u'Fredrik Lundh, Alex Clark and Contributors'
 #
 # The short X.Y version.
 import PIL
-version = PIL.PILLOW_VERSION
+version = PIL.__version__
 # The full version, including alpha/beta/rc tags.
-release = PIL.PILLOW_VERSION
+release = PIL.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

selftest.py

@@ -161,7 +161,7 @@ if __name__ == "__main__":
     exit_status = 0
 
     print("-"*68)
-    print("Pillow", Image.PILLOW_VERSION, "TEST SUMMARY ")
+    print("Pillow", Image.__version__, "TEST SUMMARY ")
     print("-"*68)
     print("Python modules loaded from", os.path.dirname(Image.__file__))
     print("Binary modules loaded from", os.path.dirname(Image.core.__file__))

src/PIL/Image.py

@@ -24,7 +24,7 @@
 # See the README file for information on usage and redistribution.
 #
 
-from . import VERSION, PILLOW_VERSION, _plugins
+from . import __version__, _plugins
 
 import logging
 import warnings
@@ -58,13 +58,13 @@ try:
     # Also note that Image.core is not a publicly documented interface,
     # and should be considered private and subject to change.
     from . import _imaging as core
-    if PILLOW_VERSION != getattr(core, 'PILLOW_VERSION', None):
+    if __version__ != getattr(core, 'PILLOW_VERSION', None):
         raise ImportError("The _imaging extension was built for another "
                           "version of Pillow or PIL:\n"
                           "Core version: %s\n"
                           "Pillow version: %s" %
                           (getattr(core, 'PILLOW_VERSION', None),
-                           PILLOW_VERSION))
+                           __version__))
 
 except ImportError as v:
     core = _imaging_not_installed()

src/PIL/ImageCms.py

@@ -951,5 +951,5 @@ def versions():
 
     return (
         VERSION, core.littlecms_version,
-        sys.version.split()[0], Image.VERSION
+        sys.version.split()[0], Image.__version__
     )

src/PIL/__init__.py

@@ -13,10 +13,8 @@
 
 from . import version
 
-VERSION = '1.1.7'  # PIL Version
-PILLOW_VERSION = version.__version__
-
-__version__ = PILLOW_VERSION
+# PILLOW_VERSION and VERSION are deprecated and will be removed in Pillow 6.0.0. Use __version__ instead.
+PILLOW_VERSION = VERSION = __version__ = version.__version__
 
 _plugins = ['BlpImagePlugin',
             'BmpImagePlugin',