Merge pull request #4975 from nulano/features-setuptools

Avoid using pkg_resources in PIL.features.pilinfo
This commit is contained in:
Hugo van Kemenade 2020-10-14 16:33:22 +03:00 committed by GitHub
commit ca42412cea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -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:

View File

@ -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