python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-25 22:54:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed distutils.version

Browse Source
This commit is contained in:
Andrew Murray 2019-01-06 13:15:01 +11:00
parent 1b91ae361d
commit 10710cae2e
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/test_file_libtiff.py
View File

@ -8,7 +8,6 @@ import io
import logging import logging
import itertools import itertools
import os import os
import distutils.version
from PIL import Image, TiffImagePlugin, TiffTags from PIL import Image, TiffImagePlugin, TiffTags
@ -241,11 +240,8 @@ class TestFileLibTiff(LibTiffTestCase):
37004: b'custom tag value' 37004: b'custom tag value'
} }
libtiff_version = TiffImagePlugin._libtiff_version()
libtiffs = [False] libtiffs = [False]
if distutils.version.StrictVersion(libtiff_version) >= \ if int(TiffImagePlugin._libtiff_version().split(".")[0]) >= 4:
distutils.version.StrictVersion("4.0"):
libtiffs.append(True) libtiffs.append(True)
for libtiff in libtiffs: for libtiff in libtiffs:

4
src/PIL/TiffImagePlugin.py
View File

@ -54,7 +54,6 @@ import os
import struct import struct
import sys import sys
import warnings import warnings
import distutils.version
from .TiffTags import TYPES from .TiffTags import TYPES
@ -1526,8 +1525,7 @@ def _save(im, fp, filename):
if tag not in TiffTags.LIBTIFF_CORE: if tag not in TiffTags.LIBTIFF_CORE:
if TiffTags.lookup(tag).type == TiffTags.UNDEFINED: if TiffTags.lookup(tag).type == TiffTags.UNDEFINED:
continue continue
if (distutils.version.StrictVersion(_libtiff_version()) < if int(_libtiff_version().split(".")[0]) < 4 \
distutils.version.StrictVersion("4.0")) \
or not (isinstance(value, (int, float, str, bytes)) or or not (isinstance(value, (int, float, str, bytes)) or
(not py3 and isinstance(value, unicode))): # noqa: F821 (not py3 and isinstance(value, unicode))): # noqa: F821
continue continue