Update to isort 5 with Black profile support

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
         types: []
 
   - repo: https://github.com/timothycrosley/isort
-    rev: 7c29dd9d55161704cfc45998c6f5c2c43d39264b  # frozen: 4.3.21
+    rev: 9ae09866e278fbc6ec0383ccb16b5c84e78e6e4d  # frozen: 5.3.2
     hooks:
       - id: isort
 

Tests/check_imaging_leaks.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import pytest
+
 from PIL import Image
 
 from .helper import is_win32
@@ -11,7 +12,7 @@ pytestmark = pytest.mark.skipif(is_win32(), reason="requires Unix or macOS")
 
 
 def _get_mem_usage():
-    from resource import getpagesize, getrusage, RUSAGE_SELF
+    from resource import RUSAGE_SELF, getpagesize, getrusage
 
     mem = getrusage(RUSAGE_SELF).ru_maxrss
     return mem * getpagesize() / 1024 / 1024

Tests/check_j2k_leaks.py

@@ -1,6 +1,7 @@
 from io import BytesIO
 
 import pytest
+
 from PIL import Image
 
 from .helper import is_win32, skip_unless_feature
@@ -18,7 +19,7 @@ pytestmark = [
 
 
 def test_leak_load():
-    from resource import setrlimit, RLIMIT_AS, RLIMIT_STACK
+    from resource import RLIMIT_AS, RLIMIT_STACK, setrlimit
 
     setrlimit(RLIMIT_STACK, (stack_size, stack_size))
     setrlimit(RLIMIT_AS, (mem_limit, mem_limit))
@@ -28,7 +29,7 @@ def test_leak_load():
 
 
 def test_leak_save():
-    from resource import setrlimit, RLIMIT_AS, RLIMIT_STACK
+    from resource import RLIMIT_AS, RLIMIT_STACK, setrlimit
 
     setrlimit(RLIMIT_STACK, (stack_size, stack_size))
     setrlimit(RLIMIT_AS, (mem_limit, mem_limit))

Tests/check_j2k_overflow.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 

Tests/check_large_memory.py

@@ -1,6 +1,7 @@
 import sys
 
 import pytest
+
 from PIL import Image
 
 # This test is not run automatically.

Tests/check_large_memory_numpy.py

@@ -1,6 +1,7 @@
 import sys
 
 import pytest
+
 from PIL import Image
 
 # This test is not run automatically.

Tests/check_libtiff_segfault.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 TEST_FILE = "Tests/images/libtiff_segfault.tif"

Tests/helper.py

@@ -11,6 +11,7 @@ import tempfile
 from io import BytesIO
 
 import pytest
+
 from PIL import Image, ImageMath, features
 
 logger = logging.getLogger(__name__)
@@ -184,7 +185,7 @@ class PillowLeakTestCase:
         :returns: memory usage in kilobytes
         """
 
-        from resource import getrusage, RUSAGE_SELF
+        from resource import RUSAGE_SELF, getrusage
 
         mem = getrusage(RUSAGE_SELF).ru_maxrss
         if sys.platform == "darwin":

Tests/test_bmp_reference.py

@@ -1,6 +1,7 @@
 import os
 
 import pytest
+
 from PIL import Image
 
 from .helper import assert_image_similar

Tests/test_box_blur.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageFilter
 
 sample = Image.new("L", (7, 5))

Tests/test_color_lut.py

@@ -1,6 +1,7 @@
 from array import array
 
 import pytest
+
 from PIL import Image, ImageFilter
 
 from .helper import assert_image_equal

Tests/test_core_resources.py

@@ -1,6 +1,7 @@
 import sys
 
 import pytest
+
 from PIL import Image
 
 from .helper import is_pypy

Tests/test_decompression_bomb.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 from .helper import hopper

Tests/test_features.py

@@ -2,6 +2,7 @@ import io
 import re
 
 import pytest
+
 from PIL import features
 
 from .helper import skip_unless_feature

Tests/test_file_apng.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageSequence, PngImagePlugin
 
 

Tests/test_file_bmp.py

@@ -1,6 +1,7 @@
 import io
 
 import pytest
+
 from PIL import BmpImagePlugin, Image
 
 from .helper import assert_image_equal, hopper

Tests/test_file_bufrstub.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import BufrStubImagePlugin, Image
 
 from .helper import hopper

Tests/test_file_cur.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import CurImagePlugin, Image
 
 TEST_FILE = "Tests/images/deerstalker.cur"

Tests/test_file_dcx.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import DcxImagePlugin, Image
 
 from .helper import assert_image_equal, hopper, is_pypy

Tests/test_file_dds.py

@@ -2,6 +2,7 @@
 from io import BytesIO
 
 import pytest
+
 from PIL import DdsImagePlugin, Image
 
 from .helper import assert_image_equal

Tests/test_file_eps.py

@@ -1,6 +1,7 @@
 import io
 
 import pytest
+
 from PIL import EpsImagePlugin, Image, features
 
 from .helper import assert_image_similar, hopper, skip_unless_feature

Tests/test_file_fitsstub.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import FitsStubImagePlugin, Image
 
 TEST_FILE = "Tests/images/hopper.fits"

Tests/test_file_fli.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import FliImagePlugin, Image
 
 from .helper import assert_image_equal, is_pypy

Tests/test_file_fpx.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 FpxImagePlugin = pytest.importorskip(

Tests/test_file_gbr.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import GbrImagePlugin, Image
 
 from .helper import assert_image_equal

Tests/test_file_gd.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import GdImageFile, UnidentifiedImageError
 
 TEST_GD_FILE = "Tests/images/hopper.gd"

Tests/test_file_gif.py

@@ -1,6 +1,7 @@
 from io import BytesIO
 
 import pytest
+
 from PIL import GifImagePlugin, Image, ImageDraw, ImagePalette, features
 
 from .helper import (

Tests/test_file_gimppalette.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL.GimpPaletteFile import GimpPaletteFile
 
 

Tests/test_file_gribstub.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import GribStubImagePlugin, Image
 
 from .helper import hopper

Tests/test_file_hdf5stub.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Hdf5StubImagePlugin, Image
 
 TEST_FILE = "Tests/images/hdf5.h5"

Tests/test_file_icns.py

@@ -2,6 +2,7 @@ import io
 import sys
 
 import pytest
+
 from PIL import IcnsImagePlugin, Image, features
 
 from .helper import assert_image_equal, assert_image_similar

Tests/test_file_ico.py

@@ -1,6 +1,7 @@
 import io
 
 import pytest
+
 from PIL import IcoImagePlugin, Image, ImageDraw
 
 from .helper import assert_image_equal, hopper

Tests/test_file_im.py

@@ -1,6 +1,7 @@
 import filecmp
 
 import pytest
+
 from PIL import Image, ImImagePlugin
 
 from .helper import assert_image_equal, hopper, is_pypy

Tests/test_file_jpeg.py

@@ -3,6 +3,7 @@ import re
 from io import BytesIO
 
 import pytest
+
 from PIL import (
     ExifTags,
     Image,

Tests/test_file_jpeg2k.py

@@ -2,6 +2,7 @@ import re
 from io import BytesIO
 
 import pytest
+
 from PIL import Image, ImageFile, Jpeg2KImagePlugin, features
 
 from .helper import (

Tests/test_file_libtiff.py

@@ -7,6 +7,7 @@ from collections import namedtuple
 from ctypes import c_float
 
 import pytest
+
 from PIL import Image, ImageFilter, TiffImagePlugin, TiffTags, features
 
 from .helper import (

Tests/test_file_mcidas.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, McIdasImagePlugin
 
 from .helper import assert_image_equal

Tests/test_file_mic.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImagePalette
 
 from .helper import assert_image_similar, hopper, skip_unless_feature

Tests/test_file_mpo.py

@@ -1,6 +1,7 @@
 from io import BytesIO
 
 import pytest
+
 from PIL import Image
 
 from .helper import assert_image_similar, is_pypy, skip_unless_feature

Tests/test_file_msp.py

@@ -1,6 +1,7 @@
 import os
 
 import pytest
+
 from PIL import Image, MspImagePlugin
 
 from .helper import assert_image_equal, hopper

Tests/test_file_palm.py

@@ -2,6 +2,7 @@ import os.path
 import subprocess
 
 import pytest
+
 from PIL import Image
 
 from .helper import IMCONVERT, assert_image_equal, hopper, imagemagick_available

Tests/test_file_pcx.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageFile, PcxImagePlugin
 
 from .helper import assert_image_equal, hopper

Tests/test_file_pdf.py

@@ -5,6 +5,7 @@ import tempfile
 import time
 
 import pytest
+
 from PIL import Image, PdfParser
 
 from .helper import hopper

Tests/test_file_pixar.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, PixarImagePlugin
 
 from .helper import assert_image_similar, hopper

Tests/test_file_png.py

@@ -3,6 +3,7 @@ import zlib
 from io import BytesIO
 
 import pytest
+
 from PIL import Image, ImageFile, PngImagePlugin, features
 
 from .helper import (

Tests/test_file_ppm.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 from .helper import assert_image_equal, assert_image_similar, hopper

Tests/test_file_psd.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, PsdImagePlugin
 
 from .helper import assert_image_similar, hopper, is_pypy

Tests/test_file_sgi.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, SgiImagePlugin
 
 from .helper import assert_image_equal, assert_image_similar, hopper

Tests/test_file_spider.py

@@ -2,6 +2,7 @@ import tempfile
 from io import BytesIO
 
 import pytest
+
 from PIL import Image, ImageSequence, SpiderImagePlugin
 
 from .helper import assert_image_equal, hopper, is_pypy

Tests/test_file_sun.py

@@ -1,6 +1,7 @@
 import os
 
 import pytest
+
 from PIL import Image, SunImagePlugin
 
 from .helper import assert_image_equal, assert_image_similar, hopper

Tests/test_file_tar.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, TarIO, features
 
 from .helper import is_pypy

Tests/test_file_tga.py

@@ -3,6 +3,7 @@ from glob import glob
 from itertools import product
 
 import pytest
+
 from PIL import Image
 
 from .helper import assert_image_equal, hopper

Tests/test_file_tiff.py

@@ -2,6 +2,7 @@ import os
 from io import BytesIO
 
 import pytest
+
 from PIL import Image, TiffImagePlugin
 from PIL.TiffImagePlugin import RESOLUTION_UNIT, X_RESOLUTION, Y_RESOLUTION
 

Tests/test_file_tiff_metadata.py

@@ -2,6 +2,7 @@ import io
 import struct
 
 import pytest
+
 from PIL import Image, TiffImagePlugin, TiffTags
 from PIL.TiffImagePlugin import IFDRational
 

Tests/test_file_webp.py

@@ -2,6 +2,7 @@ import io
 import re
 
 import pytest
+
 from PIL import Image, WebPImagePlugin, features
 
 from .helper import (

Tests/test_file_webp_alpha.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 from .helper import assert_image_equal, assert_image_similar, hopper

Tests/test_file_webp_animated.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 from .helper import (

Tests/test_file_webp_lossless.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 from .helper import assert_image_equal, hopper

Tests/test_file_wmf.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, WmfImagePlugin
 
 from .helper import assert_image_similar, hopper

Tests/test_file_xbm.py

@@ -1,6 +1,7 @@
 from io import BytesIO
 
 import pytest
+
 from PIL import Image
 
 from .helper import hopper

Tests/test_file_xpm.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, XpmImagePlugin
 
 from .helper import assert_image_similar, hopper

Tests/test_file_xvthumb.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, XVThumbImagePlugin
 
 from .helper import assert_image_similar, hopper

Tests/test_font_bdf.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import BdfFontFile, FontFile
 
 filename = "Tests/images/courB08.bdf"

Tests/test_font_pcf.py

@@ -1,6 +1,7 @@
 import os
 
 import pytest
+
 from PIL import FontFile, Image, ImageDraw, ImageFont, PcfFontFile
 
 from .helper import assert_image_equal, assert_image_similar, skip_unless_feature

Tests/test_image.py

@@ -3,8 +3,9 @@ import os
 import shutil
 import tempfile
 
-import PIL
 import pytest
+
+import PIL
 from PIL import Image, ImageDraw, ImagePalette, ImageShow, UnidentifiedImageError
 
 from .helper import (

Tests/test_image_access.py

@@ -4,9 +4,9 @@ import subprocess
 import sys
 import sysconfig
 
+import pytest
 from setuptools.command.build_ext import new_compiler
 
-import pytest
 from PIL import Image
 
 from .helper import assert_image_equal, hopper, is_win32, on_ci
@@ -17,8 +17,9 @@ if os.environ.get("PYTHONOPTIMIZE") == "2":
     cffi = None
 else:
     try:
-        from PIL import PyAccess
         import cffi
+
+        from PIL import PyAccess
     except ImportError:
         cffi = None
 

Tests/test_image_array.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 from .helper import hopper

Tests/test_image_convert.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 from .helper import assert_image, assert_image_equal, assert_image_similar, hopper

Tests/test_image_crop.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 from .helper import assert_image_equal, hopper

Tests/test_image_filter.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageFilter
 
 from .helper import assert_image_equal, hopper

Tests/test_image_fromqimage.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageQt
 
 from .helper import assert_image_equal, hopper

Tests/test_image_load.py

@@ -1,6 +1,7 @@
 import os
 
 import pytest
+
 from PIL import Image
 
 from .helper import hopper

Tests/test_image_putpalette.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import ImagePalette
 
 from .helper import hopper

Tests/test_image_quantize.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 from .helper import assert_image, assert_image_similar, hopper

Tests/test_image_reduce.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageMath, ImageMode
 
 from .helper import convert_to_comparable, skip_unless_feature

Tests/test_image_resample.py

@@ -1,6 +1,7 @@
 from contextlib import contextmanager
 
 import pytest
+
 from PIL import Image, ImageDraw
 
 from .helper import assert_image_equal, assert_image_similar, hopper

Tests/test_image_resize.py

@@ -4,6 +4,7 @@ Tests for resize functionality.
 from itertools import permutations
 
 import pytest
+
 from PIL import Image
 
 from .helper import assert_image_equal, assert_image_similar, hopper

Tests/test_image_thumbnail.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 from .helper import (

Tests/test_image_transform.py

@@ -1,6 +1,7 @@
 import math
 
 import pytest
+
 from PIL import Image, ImageTransform
 
 from .helper import assert_image_equal, assert_image_similar, hopper

Tests/test_imagecms.py

@@ -4,6 +4,7 @@ import re
 from io import BytesIO
 
 import pytest
+
 from PIL import Image, ImageMode, features
 
 from .helper import assert_image, assert_image_equal, assert_image_similar, hopper

Tests/test_imagecolor.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageColor
 
 

Tests/test_imagedraw.py

@@ -1,6 +1,7 @@
 import os.path
 
 import pytest
+
 from PIL import Image, ImageColor, ImageDraw, ImageFont
 
 from .helper import (

Tests/test_imagefile.py

@@ -1,6 +1,7 @@
 from io import BytesIO
 
 import pytest
+
 from PIL import EpsImagePlugin, Image, ImageFile, features
 
 from .helper import (

Tests/test_imagefont.py

@@ -7,6 +7,7 @@ from io import BytesIO
 
 import pytest
 from packaging.version import parse as parse_version
+
 from PIL import Image, ImageDraw, ImageFont, features
 
 from .helper import (

Tests/test_imagefont_bitmap.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageDraw, ImageFont
 
 from .helper import assert_image_similar

Tests/test_imagefontctl.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageDraw, ImageFont
 
 from .helper import assert_image_similar, skip_unless_feature

Tests/test_imagegrab.py

@@ -3,6 +3,7 @@ import subprocess
 import sys
 
 import pytest
+
 from PIL import Image, ImageGrab
 
 from .helper import assert_image, assert_image_equal_tofile, skip_unless_feature

Tests/test_imagemorph.py

@@ -1,5 +1,6 @@
 # Test the ImageMorphology functionality
 import pytest
+
 from PIL import Image, ImageMorph, _imagingmorph
 
 from .helper import assert_image_equal, hopper

Tests/test_imageops.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageOps, features
 
 from .helper import (

Tests/test_imageops_usm.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageFilter
 
 

Tests/test_imagepalette.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImagePalette
 
 from .helper import assert_image_equal

Tests/test_imagepath.py

@@ -2,6 +2,7 @@ import array
 import struct
 
 import pytest
+
 from PIL import Image, ImagePath
 
 

Tests/test_imageqt.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import ImageQt
 
 from .helper import hopper

Tests/test_imagesequence.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageSequence, TiffImagePlugin
 
 from .helper import assert_image_equal, hopper, skip_unless_feature

Tests/test_imageshow.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageShow
 
 from .helper import hopper, is_win32, on_ci

Tests/test_imagestat.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image, ImageStat
 
 from .helper import hopper

Tests/test_imagetk.py

@@ -1,13 +1,14 @@
 import pytest
+
 from PIL import Image
 
 from .helper import assert_image_equal, hopper
 
 try:
-    from PIL import ImageTk
-
     import tkinter as tk
 
+    from PIL import ImageTk
+
     dir(ImageTk)
     HAS_TK = True
 except (OSError, ImportError):

Tests/test_imagewin.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import ImageWin
 
 from .helper import hopper, is_win32

Tests/test_lib_image.py

@@ -1,4 +1,5 @@
 import pytest
+
 from PIL import Image
 
 

Tests/test_lib_pack.py

@@ -1,6 +1,7 @@
 import sys
 
 import pytest
+
 from PIL import Image
 
 X = 255