Merge branch 'master' into imagecms-deprecations

CHANGES.rst

@@ -5,6 +5,18 @@ Changelog (Pillow)
 6.0.0 (unreleased)
 ------------------
 
+- Deprecate support for PyQt4 and PySide #3655
+  [hugovk, radarhere]
+
+- Add TIFF compression codecs: LZMA, Zstd, WebP #3555
+  [cgohlke]
+
+- Fixed pickling of iTXt class with protocol > 1 #3537
+  [radarhere]
+
+- _util.isPath returns True for pathlib.Path objects #3616
+  [wbadart]
+
 - Remove unnecessary unittest.main() boilerplate from test files #3631
   [jdufresne]
 

Tests/test_imageqt.py

@@ -1,7 +1,16 @@
 from .helper import PillowTestCase, hopper
 
-from PIL import ImageQt
+import warnings
 
+deprecated = False
+with warnings.catch_warnings():
+    warnings.filterwarnings("error", category=DeprecationWarning)
+    try:
+        from PIL import ImageQt
+    except DeprecationWarning:
+        deprecated = True
+        warnings.filterwarnings("ignore", category=DeprecationWarning)
+        from PIL import ImageQt
 
 if ImageQt.qt_is_installed:
     from PIL.ImageQt import qRgba
@@ -78,3 +87,6 @@ class TestImageQt(PillowQtTestCase, PillowTestCase):
     def test_image(self):
         for mode in ('1', 'RGB', 'RGBA', 'L', 'P'):
             ImageQt.ImageQt(hopper(mode))
+
+    def test_deprecated(self):
+        self.assertEqual(ImageQt.qt_version in ["4", "side"], deprecated)

Tests/test_pickle.py

@@ -67,9 +67,13 @@ class TestPickle(PillowTestCase):
                 "Tests/images/non_zero_bb.png",
                 "Tests/images/non_zero_bb_scale2.png",
                 "Tests/images/p_trns_single.png",
-                "Tests/images/pil123p.png"
+                "Tests/images/pil123p.png",
+                "Tests/images/itxt_chunks.png"
         ]:
-            self.helper_pickle_string(pickle, test_file=test_file)
+            for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1):
+                self.helper_pickle_string(pickle,
+                                          protocol=protocol,
+                                          test_file=test_file)
 
     def test_pickle_l_mode(self):
         # Arrange

Tests/test_util.py

@@ -1,4 +1,4 @@
-from .helper import PillowTestCase
+from .helper import unittest, PillowTestCase
 
 from PIL import _util
 
@@ -35,6 +35,18 @@ class TestUtil(PillowTestCase):
         # Assert
         self.assertTrue(it_is)
 
+    @unittest.skipIf(not _util.py36, 'os.path support for Paths added in 3.6')
+    def test_path_obj_is_path(self):
+        # Arrange
+        from pathlib import Path
+        test_path = Path('filename.ext')
+
+        # Act
+        it_is = _util.isPath(test_path)
+
+        # Assert
+        self.assertTrue(it_is)
+
     def test_is_not_path(self):
         # Arrange
         filename = self.tempfile("temp.ext")

docs/deprecations.rst

@@ -12,6 +12,42 @@ Deprecated features
 Below are features which are considered deprecated. Where appropriate,
 a ``DeprecationWarning`` is issued.
 
+PyQt4 and PySide
+~~~~~~~~~~~~~~~~
+
+.. deprecated:: 6.0.0
+
+Qt 4 reached end-of-life on 2015-12-19. Its Python bindings are also EOL: PyQt4 since
+2018-08-31 and PySide since 2015-10-14.
+
+Support for PyQt4 and PySide has been deprecated from ``ImageQt`` and will be removed in
+a future version. Please upgrade to PyQt5 or PySide2.
+
+PIL.*ImagePlugin.__version__ attributes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 6.0.0
+
+The version constants of individual plugins have been deprecated and will be removed in
+a future version. Use ``PIL.__version__`` instead.
+
+===============================  =================================  ==================================
+Deprecated                       Deprecated                         Deprecated
+===============================  =================================  ==================================
+``BmpImagePlugin.__version__``   ``Jpeg2KImagePlugin.__version__``  ``PngImagePlugin.__version__``
+``CurImagePlugin.__version__``   ``JpegImagePlugin.__version__``    ``PpmImagePlugin.__version__``
+``DcxImagePlugin.__version__``   ``McIdasImagePlugin.__version__``  ``PsdImagePlugin.__version__``
+``EpsImagePlugin.__version__``   ``MicImagePlugin.__version__``     ``SgiImagePlugin.__version__``
+``FliImagePlugin.__version__``   ``MpegImagePlugin.__version__``    ``SunImagePlugin.__version__``
+``FpxImagePlugin.__version__``   ``MpoImagePlugin.__version__``     ``TgaImagePlugin.__version__``
+``GdImageFile.__version__``      ``MspImagePlugin.__version__``     ``TiffImagePlugin.__version__``
+``GifImagePlugin.__version__``   ``PalmImagePlugin.__version__``    ``WmfImagePlugin.__version__``
+``IcoImagePlugin.__version__``   ``PcdImagePlugin.__version__``     ``XbmImagePlugin.__version__``
+``ImImagePlugin.__version__``    ``PcxImagePlugin.__version__``     ``XpmImagePlugin.__version__``
+``ImtImagePlugin.__version__``   ``PdfImagePlugin.__version__``     ``XVThumbImagePlugin.__version__``
+``IptcImagePlugin.__version__``  ``PixarImagePlugin.__version__``
+===============================  =================================  ==================================
+
 Setting the size of TIFF images
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

docs/reference/ImageQt.rst

@@ -7,6 +7,12 @@
 The :py:mod:`ImageQt` module contains support for creating PyQt4, PyQt5, PySide or
 PySide2 QImage objects from PIL images.
 
+Qt 4 reached end-of-life on 2015-12-19. Its Python bindings are also EOL: PyQt4 since
+2018-08-31 and PySide since 2015-10-14.
+
+Support for PyQt4 and PySide is deprecated since Pillow 6.0.0 and will be removed in a
+future version. Please upgrade to PyQt5 or PySide2.
+
 .. versionadded:: 1.1.6
 
 .. py:class:: ImageQt.ImageQt(image)

docs/releasenotes/6.0.0.rst

@@ -32,10 +32,20 @@ API Changes
 Deprecations
 ^^^^^^^^^^^^
 
+PyQt4 and PySide
+~~~~~~~~~~~~~~~~
+
+Qt 4 reached end-of-life on 2015-12-19. Its Python bindings are also EOL: PyQt4 since
+2018-08-31 and PySide since 2015-10-14.
+
+Support for PyQt4 and PySide has been deprecated from ``ImageQt`` and will be removed in
+a future version. Please upgrade to PyQt5 or PySide2.
+
 PIL.*ImagePlugin.__version__ attributes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-These version constants have been deprecated and will be removed in a future version.
+These version constants have been deprecated and will be removed in a future
+version.
 
 * ``BmpImagePlugin.__version__``
 * ``CurImagePlugin.__version__``

src/PIL/Image.py

@@ -655,8 +655,7 @@ class Image(object):
         return filename
 
     def __eq__(self, other):
-        return (isinstance(other, Image) and
-                self.__class__.__name__ == other.__class__.__name__ and
+        return (self.__class__ is other.__class__ and
                 self.mode == other.mode and
                 self.size == other.size and
                 self.info == other.info and

src/PIL/ImageQt.py

@@ -20,6 +20,7 @@ from . import Image
 from ._util import isPath, py3
 from io import BytesIO
 import sys
+import warnings
 
 qt_versions = [
     ['5', 'PyQt5'],
@@ -27,6 +28,12 @@ qt_versions = [
     ['4', 'PyQt4'],
     ['side', 'PySide']
 ]
+
+WARNING_TEXT = (
+    "Support for EOL {} is deprecated and will be removed in a future version. "
+    "Please upgrade to PyQt5 or PySide2."
+)
+
 # If a version has already been imported, attempt it first
 qt_versions.sort(key=lambda qt_version: qt_version[1] in sys.modules,
                  reverse=True)
@@ -41,9 +48,13 @@ for qt_version, qt_module in qt_versions:
         elif qt_module == 'PyQt4':
             from PyQt4.QtGui import QImage, qRgba, QPixmap
             from PyQt4.QtCore import QBuffer, QIODevice
+
+            warnings.warn(WARNING_TEXT.format(qt_module), DeprecationWarning)
         elif qt_module == 'PySide':
             from PySide.QtGui import QImage, qRgba, QPixmap
             from PySide.QtCore import QBuffer, QIODevice
+
+            warnings.warn(WARNING_TEXT.format(qt_module), DeprecationWarning)
     except (ImportError, RuntimeError):
         continue
     qt_is_installed = True
@@ -67,7 +78,7 @@ def fromqimage(im):
     """
     buffer = QBuffer()
     buffer.open(QIODevice.ReadWrite)
-    # preserve alha channel with png
+    # preserve alpha channel with png
     # otherwise ppm is more friendly with Image.open
     if im.hasAlphaChannel():
         im.save(buffer, 'png')

src/PIL/PngImagePlugin.py

@@ -194,7 +194,7 @@ class iTXt(str):
 
     """
     @staticmethod
-    def __new__(cls, text, lang, tkey):
+    def __new__(cls, text, lang=None, tkey=None):
         """
         :param cls: the class to use when creating the instance
         :param text: value for this key

src/PIL/TiffImagePlugin.py

@@ -135,6 +135,9 @@ COMPRESSION_INFO = {
     32946: "tiff_deflate",
     34676: "tiff_sgilog",
     34677: "tiff_sgilog24",
+    34925: "lzma",
+    50000: "zstd",
+    50001: "webp",
 }
 
 COMPRESSION_INFO_REV = {v: k for k, v in COMPRESSION_INFO.items()}
@@ -423,7 +426,7 @@ class ImageFileDirectory_v2(MutableMapping):
 
         ifd = ImageFileDirectory_v2()
         ifd[key] = 'Some Data'
-        ifd.tagtype[key] = 2
+        ifd.tagtype[key] = TiffTags.ASCII
         print(ifd[key])
         'Some Data'
 
@@ -557,7 +560,7 @@ class ImageFileDirectory_v2(MutableMapping):
             if info.type:
                 self.tagtype[tag] = info.type
             else:
-                self.tagtype[tag] = 7
+                self.tagtype[tag] = TiffTags.UNDEFINED
                 if all(isinstance(v, IFDRational) for v in values):
                     self.tagtype[tag] = TiffTags.RATIONAL
                 elif all(isinstance(v, int) for v in values):
@@ -872,7 +875,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2):
 
         ifd = ImageFileDirectory_v1()
         ifd[key] = 'Some Data'
-        ifd.tagtype[key] = 2
+        ifd.tagtype[key] = TiffTags.ASCII
         print(ifd[key])
         ('Some Data',)
 

src/PIL/_util.py

@@ -2,13 +2,20 @@ import os
 import sys
 
 py3 = sys.version_info.major >= 3
+py36 = sys.version_info[0:2] >= (3, 6)
 
 if py3:
     def isStringType(t):
         return isinstance(t, str)
 
-    def isPath(f):
-        return isinstance(f, (bytes, str))
+    if py36:
+        from pathlib import Path
+
+        def isPath(f):
+            return isinstance(f, (bytes, str, Path))
+    else:
+        def isPath(f):
+            return isinstance(f, (bytes, str))
 else:
     def isStringType(t):
         return isinstance(t, basestring)  # noqa: F821