Merge pull request #6659 from marksmayo/main

pylint warnings

Tests/helper.py

@@ -208,12 +208,11 @@ def _get_mem_usage(self):
             #     ru_maxrss
             # This is the maximum resident set size utilized (in bytes).
             return mem / 1024  # Kb
-        else:
-            # linux
-            # man 2 getrusage
-            #        ru_maxrss (since Linux 2.6.32)
-            #  This is the maximum resident set size used (in kilobytes).
-            return mem  # Kb
+        # linux
+        # man 2 getrusage
+        #        ru_maxrss (since Linux 2.6.32)
+        #  This is the maximum resident set size used (in kilobytes).
+        return mem  # Kb
 
     def _test_leak(self, core):
         start_mem = self._get_mem_usage()
@@ -285,7 +284,7 @@ def magick_command():
 
     if imagemagick and shutil.which(imagemagick[0]):
         return imagemagick
-    elif graphicsmagick and shutil.which(graphicsmagick[0]):
+    if graphicsmagick and shutil.which(graphicsmagick[0]):
         return graphicsmagick
 
 

Tests/test_file_jpeg.py

@@ -30,7 +30,7 @@
 )
 
 try:
-    import defusedxml.ElementTree as ElementTree
+    from defusedxml import ElementTree
 except ImportError:
     ElementTree = None
 

Tests/test_file_libtiff.py

@@ -934,7 +934,7 @@ def test_block_tile_tags(self, compression, tmp_path):
         im.save(out, exif=tags, compression=compression)
 
         with Image.open(out) as reloaded:
-            for tag in tags.keys():
+            for tag in tags:
                 assert tag not in reloaded.getexif()
 
     def test_old_style_jpeg(self):

Tests/test_file_png.py

@@ -20,7 +20,7 @@
 )
 
 try:
-    import defusedxml.ElementTree as ElementTree
+    from defusedxml import ElementTree
 except ImportError:
     ElementTree = None
 

Tests/test_file_ppm.py

@@ -240,7 +240,7 @@ def test_header_token_too_long(tmp_path):
 def test_truncated_file(tmp_path):
     # Test EOF in header
     path = str(tmp_path / "temp.pgm")
-    with open(path, "w") as f:
+    with open(path, "w", encoding="utf-8") as f:
         f.write("P6")
 
     with pytest.raises(ValueError) as e:
@@ -259,7 +259,7 @@ def test_truncated_file(tmp_path):
 @pytest.mark.parametrize("maxval", (0, 65536))
 def test_invalid_maxval(maxval, tmp_path):
     path = str(tmp_path / "temp.ppm")
-    with open(path, "w") as f:
+    with open(path, "w", encoding="utf-8") as f:
         f.write("P6\n3 1 " + str(maxval))
 
     with pytest.raises(ValueError) as e:
@@ -283,12 +283,12 @@ def test_neg_ppm():
 def test_mimetypes(tmp_path):
     path = str(tmp_path / "temp.pgm")
 
-    with open(path, "w") as f:
+    with open(path, "w", encoding="utf-8") as f:
         f.write("P4\n128 128\n255")
     with Image.open(path) as im:
         assert im.get_format_mimetype() == "image/x-portable-bitmap"
 
-    with open(path, "w") as f:
+    with open(path, "w", encoding="utf-8") as f:
         f.write("PyCMYK\n128 128\n255")
     with Image.open(path) as im:
         assert im.get_format_mimetype() == "image/x-portable-anymap"

Tests/test_file_tiff.py

@@ -18,7 +18,7 @@
 )
 
 try:
-    import defusedxml.ElementTree as ElementTree
+    from defusedxml import ElementTree
 except ImportError:
     ElementTree = None
 

Tests/test_image.py

@@ -129,8 +129,6 @@ def test_width_height(self):
             im.size = (3, 4)
 
     def test_invalid_image(self):
-        import io
-
         im = io.BytesIO(b"")
         with pytest.raises(UnidentifiedImageError):
             with Image.open(im):
@@ -699,15 +697,15 @@ def act(fp):
     def test_empty_exif(self):
         with Image.open("Tests/images/exif.png") as im:
             exif = im.getexif()
-        assert dict(exif) != {}
+        assert dict(exif)
 
         # Test that exif data is cleared after another load
         exif.load(None)
-        assert dict(exif) == {}
+        assert not dict(exif)
 
         # Test loading just the EXIF header
         exif.load(b"Exif\x00\x00")
-        assert dict(exif) == {}
+        assert not dict(exif)
 
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"

Tests/test_image_access.py

@@ -131,8 +131,7 @@ def color(mode):
         bands = Image.getmodebands(mode)
         if bands == 1:
             return 1
-        else:
-            return tuple(range(1, bands + 1))
+        return tuple(range(1, bands + 1))
 
     def check(self, mode, c=None):
         if not c:
@@ -415,7 +414,7 @@ class TestEmbeddable:
     def test_embeddable(self):
         import ctypes
 
-        with open("embed_pil.c", "w") as fh:
+        with open("embed_pil.c", "w", encoding="utf-8") as fh:
             fh.write(
                 """
 #include "Python.h"

Tests/test_imagemath.py

@@ -6,7 +6,7 @@
 def pixel(im):
     if hasattr(im, "im"):
         return f"{im.mode} {repr(im.getpixel((0, 0)))}"
-    elif isinstance(im, int):
+    if isinstance(im, int):
         return int(im)  # hack to deal with booleans
 
 

setup.py

@@ -23,7 +23,7 @@
 
 def get_version():
     version_file = "src/PIL/_version.py"
-    with open(version_file) as f:
+    with open(version_file, encoding="utf-8") as f:
         exec(compile(f.read(), version_file, "exec"))
     return locals()["__version__"]