From 97871205c206da04057a2b38ffb881364546d15d Mon Sep 17 00:00:00 2001 From: nulano Date: Wed, 22 Jul 2020 23:48:17 +0200 Subject: [PATCH] Replace distutils.version with packaging.version.parse, distutils will eventually be removed from stdlib --- Tests/test_imagefont.py | 8 +++++--- Tests/test_imagefontctl.py | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 799d41333..f8178adc8 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -798,9 +798,11 @@ class TestImageFont: def test_anchor(self, anchor, left, left_raqm, top): name, text = "quick", "Quick" target = "Tests/images/test_anchor_%s_%s.png" % (name, anchor) - freetype = distutils.version.StrictVersion(ImageFont.core.freetype2_version) + freetype = parse_version(features.version_module("freetype2")) - if self.LAYOUT_ENGINE == ImageFont.LAYOUT_RAQM or freetype < "2.4": + if self.LAYOUT_ENGINE == ImageFont.LAYOUT_RAQM or freetype < parse_version( + "2.4" + ): width, height = (129, 44) left = left_raqm else: @@ -871,7 +873,7 @@ class TestImageFont_RaqmLayout(TestImageFont): def test_render_mono_size(): # issue 4177 - if parse_version(ImageFont.core.freetype2_version) < parse_version("2.4"): + if parse_version(features.version_module("freetype2")) < parse_version("2.4"): pytest.skip("Different metrics") im = Image.new("P", (100, 30), "white") diff --git a/Tests/test_imagefontctl.py b/Tests/test_imagefontctl.py index 85f9cdc20..4fb2d3bfd 100644 --- a/Tests/test_imagefontctl.py +++ b/Tests/test_imagefontctl.py @@ -1,7 +1,8 @@ import distutils.version import pytest -from PIL import Image, ImageDraw, ImageFont +from packaging.version import parse as parse_version +from PIL import Image, ImageDraw, ImageFont, features from .helper import assert_image_similar, skip_unless_feature @@ -262,7 +263,7 @@ def test_getlength_combine(mode, direction, text): @pytest.mark.parametrize("anchor", ("lt", "mm", "rb", "sm")) def test_anchor_ttb(anchor): - if distutils.version.StrictVersion(ImageFont.core.freetype2_version) < "2.5.1": + if parse_version(features.version_module("freetype2")) < parse_version("2.5.1"): # FreeType 2.5.1 README: Miscellaneous Changes: # Improved computation of emulated vertical metrics for TrueType fonts. pytest.skip("FreeType <2.5.1 has incompatible ttb metrics") @@ -325,7 +326,7 @@ combine_tests = ( ) def test_combine(name, text, dir, anchor, epsilon): if ( - distutils.version.StrictVersion(ImageFont.core.freetype2_version) < "2.5.1" + parse_version(features.version_module("freetype2")) < parse_version("2.5.1") and dir == "ttb" ): # FreeType 2.5.1 README: Miscellaneous Changes: