Skip to content

Commit

Permalink
Merge pull request #4975 from nulano/features-setuptools
Browse files Browse the repository at this point in the history
Avoid using pkg_resources in PIL.features.pilinfo
  • Loading branch information
hugovk committed Oct 14, 2020
2 parents 74e9109 + e65dd04 commit ca42412
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/PIL/features.py
Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions src/_imagingcms.c
Expand Up @@ -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
Expand Down

0 comments on commit ca42412

Please sign in to comment.