Merge branch 'master' into winbuild-rewrite

Author: radarhere

.github/workflows/test-docker.yml

@@ -14,15 +14,16 @@ jobs:
           arch,
           ubuntu-16.04-xenial-amd64,
           ubuntu-18.04-bionic-amd64,
+          ubuntu-20.04-focal-amd64,
           debian-9-stretch-x86,
           debian-10-buster-x86,
           centos-6-amd64,
           centos-7-amd64,
           centos-8-amd64,
           amazon-1-amd64,
           amazon-2-amd64,
-          fedora-30-amd64,
           fedora-31-amd64,
+          fedora-32-amd64,
         ]
         dockerTag: [master]
 

.travis.yml

@@ -28,6 +28,9 @@ matrix:
 
     - python: "pypy3"
       name: "PyPy3 Xenial"
+    - python: "3.9-dev"
+      name: "3.9-dev Xenial"
+      services: xvfb
     - python: "3.8"
       name: "3.8 Xenial"
       services: xvfb

CHANGES.rst

@@ -2,6 +2,21 @@
 Changelog (Pillow)
 ==================
 
+7.2.0 (unreleased)
+------------------
+
+- Fixed bug when unpickling TIFF images #4565
+  [radarhere]
+
+- Fix pickling WebP #4561
+  [hugovk, radarhere]
+
+7.1.2 (2020-04-25)
+------------------
+
+- Raise an EOFError when seeking too far in PNG #4528
+  [radarhere]
+
 7.1.1 (2020-04-02)
 ------------------
 

MANIFEST.in

@@ -21,10 +21,8 @@ exclude .appveyor.yml
 exclude .coveragerc
 exclude .editorconfig
 exclude .readthedocs.yml
-exclude azure-pipelines.yml
 exclude codecov.yml
 global-exclude .git*
 global-exclude *.pyc
 global-exclude *.so
-prune .azure-pipelines
 prune .ci

Tests/helper.py

@@ -272,12 +272,8 @@ def on_github_actions():
 
 
 def on_ci():
-    # Travis and AppVeyor have "CI"
-    # Azure Pipelines has "TF_BUILD"
-    # GitHub Actions has "GITHUB_ACTIONS"
-    return (
-        "CI" in os.environ or "TF_BUILD" in os.environ or "GITHUB_ACTIONS" in os.environ
-    )
+    # GitHub Actions, Travis and AppVeyor have "CI"
+    return "CI" in os.environ
 
 
 def is_big_endian():

Tests/test_file_wmf.py

@@ -66,7 +66,7 @@ def test_load_set_dpi():
             assert im.size == (164, 164)
 
             with Image.open("Tests/images/drawing_wmf_ref_144.png") as expected:
-                assert_image_similar(im, expected, 2.0)
+                assert_image_similar(im, expected, 2.1)
 
 
 def test_save(tmp_path):

Tests/test_imagefile.py

@@ -95,8 +95,9 @@ def test_safeblock(self):
 
     def test_raise_ioerror(self):
         with pytest.raises(IOError):
-            with pytest.raises(DeprecationWarning):
+            with pytest.warns(DeprecationWarning) as record:
                 ImageFile.raise_ioerror(1)
+        assert len(record) == 1
 
     def test_raise_oserror(self):
         with pytest.raises(OSError):

Tests/test_pickle.py

@@ -1,11 +1,14 @@
 import pickle
 
+import pytest
 from PIL import Image
 
+from .helper import skip_unless_feature
 
-def helper_pickle_file(tmp_path, pickle, protocol=0, mode=None):
+
+def helper_pickle_file(tmp_path, pickle, protocol, test_file, mode):
     # Arrange
-    with Image.open("Tests/images/hopper.jpg") as im:
+    with Image.open(test_file) as im:
         filename = str(tmp_path / "temp.pkl")
         if mode:
             im = im.convert(mode)
@@ -20,9 +23,7 @@ def helper_pickle_file(tmp_path, pickle, protocol=0, mode=None):
         assert im == loaded_im
 
 
-def helper_pickle_string(
-    pickle, protocol=0, test_file="Tests/images/hopper.jpg", mode=None
-):
+def helper_pickle_string(pickle, protocol, test_file, mode):
     with Image.open(test_file) as im:
         if mode:
             im = im.convert(mode)
@@ -35,41 +36,31 @@ def helper_pickle_string(
         assert im == loaded_im
 
 
-def test_pickle_image(tmp_path):
+@pytest.mark.parametrize(
+    ("test_file", "test_mode"),
+    [
+        ("Tests/images/hopper.jpg", None),
+        ("Tests/images/hopper.jpg", "L"),
+        ("Tests/images/hopper.jpg", "PA"),
+        pytest.param(
+            "Tests/images/hopper.webp", None, marks=skip_unless_feature("webp")
+        ),
+        ("Tests/images/hopper.tif", None),
+        ("Tests/images/test-card.png", None),
+        ("Tests/images/zero_bb.png", None),
+        ("Tests/images/zero_bb_scale2.png", None),
+        ("Tests/images/non_zero_bb.png", None),
+        ("Tests/images/non_zero_bb_scale2.png", None),
+        ("Tests/images/p_trns_single.png", None),
+        ("Tests/images/pil123p.png", None),
+        ("Tests/images/itxt_chunks.png", None),
+    ],
+)
+def test_pickle_image(tmp_path, test_file, test_mode):
     # Act / Assert
     for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1):
-        helper_pickle_string(pickle, protocol)
-        helper_pickle_file(tmp_path, pickle, protocol)
-
-
-def test_pickle_p_mode():
-    # Act / Assert
-    for test_file in [
-        "Tests/images/test-card.png",
-        "Tests/images/zero_bb.png",
-        "Tests/images/zero_bb_scale2.png",
-        "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/itxt_chunks.png",
-    ]:
-        for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1):
-            helper_pickle_string(pickle, protocol=protocol, test_file=test_file)
-
-
-def test_pickle_pa_mode(tmp_path):
-    # Act / Assert
-    for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1):
-        helper_pickle_string(pickle, protocol, mode="PA")
-        helper_pickle_file(tmp_path, pickle, protocol, mode="PA")
-
-
-def test_pickle_l_mode(tmp_path):
-    # Act / Assert
-    for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1):
-        helper_pickle_string(pickle, protocol, mode="L")
-        helper_pickle_file(tmp_path, pickle, protocol, mode="L")
+        helper_pickle_string(pickle, protocol, test_file, test_mode)
+        helper_pickle_file(tmp_path, pickle, protocol, test_file, test_mode)
 
 
 def test_pickle_la_mode_with_palette(tmp_path):
@@ -88,3 +79,15 @@ def test_pickle_la_mode_with_palette(tmp_path):
 
         im.mode = "PA"
         assert im == loaded_im
+
+
+@skip_unless_feature("webp")
+def test_pickle_tell():
+    # Arrange
+    image = Image.open("Tests/images/hopper.webp")
+
+    # Act: roundtrip
+    unpickled_image = pickle.loads(pickle.dumps(image))
+
+    # Assert
+    assert unpickled_image.tell() == 0

docs/installation.rst

@@ -394,14 +394,18 @@ These platforms are built and tested for every change.
 +----------------------------------+--------------------------+-----------------------+
 | Debian 10 Buster                 | 3.7                      |x86                    |
 +----------------------------------+--------------------------+-----------------------+
-| Fedora 30                        | 3.7                      |x86-64                 |
-+----------------------------------+--------------------------+-----------------------+
 | Fedora 31                        | 3.7                      |x86-64                 |
 +----------------------------------+--------------------------+-----------------------+
+| Fedora 32                        | 3.8                      |x86-64                 |
++----------------------------------+--------------------------+-----------------------+
 | macOS 10.15 Catalina             | 3.5, 3.6, 3.7, 3.8, PyPy3|x86-64                 |
 +----------------------------------+--------------------------+-----------------------+
 | Ubuntu Linux 16.04 LTS           | 3.5, 3.6, 3.7, 3.8, PyPy3|x86-64                 |
 +----------------------------------+--------------------------+-----------------------+
+| Ubuntu Linux 18.04 LTS           | 3.6                      |x86-64                 |
++----------------------------------+--------------------------+-----------------------+
+| Ubuntu Linux 20.04 LTS           | 3.8                      |x86-64                 |
++----------------------------------+--------------------------+-----------------------+
 | Windows Server 2016              | 3.8                      |x86                    |
 |                                  +--------------------------+-----------------------+
 |                                  | 3.5                      |x86-64                 |

docs/reference/ImageDraw.rst

@@ -100,6 +100,25 @@ Example: Draw Partial Opacity Text
 
     out.show()
 
+Example: Draw Multiline Text
+----------------------------
+
+.. code-block:: python
+
+    from PIL import Image, ImageDraw, ImageFont
+
+    # create an image
+    out = Image.new("RGB", (150, 100), (255, 255, 255))
+
+    # get a font
+    fnt = ImageFont.truetype("Pillow/Tests/fonts/FreeMono.ttf", 40)
+    # get a drawing context
+    d = ImageDraw.Draw(out)
+
+    # draw multiline text
+    d.multiline_text((10,10), "Hello\nWorld", font=fnt, fill=(0, 0, 0))
+
+    out.show()
 
 
 Functions