From e65dd04a6395678bc2740f2cb93cc76d395dad29 Mon Sep 17 00:00:00 2001 From: nulano Date: Tue, 13 Oct 2020 17:37:19 +0100 Subject: [PATCH] avoid using pkg_resources in PIL.features.pilinfo --- src/PIL/features.py | 5 ++--- src/_imagingcms.c | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PIL/features.py b/src/PIL/features.py index c2df9c525ec..da0ca557cf2 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -224,8 +224,6 @@ def pilinfo(out=None, supported_formats=True): If ``True``, a list of all supported image file formats will be printed. """ - from pkg_resources import parse_version - if out is None: out = sys.stdout @@ -273,7 +271,8 @@ def pilinfo(out=None, supported_formats=True): if v is not None: version_static = name in ("pil", "jpg") if name == "littlecms2": - version_static = parse_version(v) < parse_version("2.7.0") + # this check is also in src/_imagingcms.c:setup_module() + version_static = tuple(int(x) for x in v.split(".")) < (2, 7) t = "compiled for" if version_static else "loaded" print("---", feature, "support ok,", t, v, file=out) else: diff --git a/src/_imagingcms.c b/src/_imagingcms.c index 59c7318a95f..4619ee94060 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -1512,6 +1512,7 @@ setup_module(PyObject* m) { d = PyModule_GetDict(m); + /* this check is also in PIL.features.pilinfo() */ #if LCMS_VERSION < 2070 vn = LCMS_VERSION; #else