[#552] Fixed most of the linting errors, except the 35 of the 51 original C901 errors, in DisplayCAL.display_cal module.

Author: eoyilmaz

DisplayCAL/argyll_rgb2xyz.py

@@ -45,7 +45,7 @@
 NORMALIZATION_FACTOR["Ynorm"] = 1.0 / NORMALIZATION_FACTOR["Ynorm"]
 
 
-def xyz_denormalize_remove_glare(x: float, y: float, z:float) -> tuple:
+def xyz_denormalize_remove_glare(x: float, y: float, z: float) -> tuple:
     """Convert XYZ to RGB using the inverse of the RGB to XYZ conversion.
 
     Args:

DisplayCAL/audio.py

@@ -124,6 +124,7 @@ def init(
     _INITIALIZED = True
     return _SERVER
 
+
 def _init_wx() -> None:
     """Initialize wx audio subsystem."""
     global _SERVER, _LIB, _LIB_VERSION, wx
@@ -177,19 +178,17 @@ def _load_audio_dll(
         _SERVER.Mix_LoadWAV_RW.argtypes = [POINTER(SDL_RWops), c_int]
         _SERVER.Mix_LoadWAV_RW.restype = POINTER(Mix_Chunk)
         _SERVER.Mix_PlayChannelTimed.argtypes = [
-                c_int,
-                POINTER(Mix_Chunk),
-                c_int,
-                c_int,
-            ]
+            c_int,
+            POINTER(Mix_Chunk),
+            c_int,
+            c_int,
+        ]
         _SERVER.Mix_VolumeChunk.argtypes = [POINTER(Mix_Chunk), c_int]
         if _INITIALIZED:
             _SERVER.Mix_Quit()
             sdl.SDL_Quit()
         sdl.SDL_Init(SDL_INIT_AUDIO)
-        _SERVER.Mix_OpenAudio(
-                samplerate, MIX_DEFAULT_FORMAT, channels, buffersize
-            )
+        _SERVER.Mix_OpenAudio(samplerate, MIX_DEFAULT_FORMAT, channels, buffersize)
         _LIB = "SDL"
         _LIB_VERSION = "2.0" if libname.startswith("SDL2") else "1.2"
         return sdl
@@ -274,13 +273,13 @@ def _init_sdl_linux(samplerate: int, channels: int, buffersize: int) -> None:
     sdl = None
     for libname in ("SDL2", "SDL2_mixer", "SDL", "SDL_mixer"):
         handle = None
-            # Hard-code lib names for Linux
+        # Hard-code lib names for Linux
         libfn = f"lib{libname}"
         if libname.startswith("SDL2"):
-                # SDL 2.0
+            # SDL 2.0
             libfn += "-2.0.so.0"
         else:
-                # SDL 1.2
+            # SDL 1.2
             libfn += "-1.2.so.0"
 
         sdl = _load_audio_dll(
@@ -332,24 +331,25 @@ def _init_pyo(samplerate: int, channels: int, buffersize: int) -> None:
     else:
         if isinstance(_SERVER, pyo.Server):
             _SERVER.reinit(
-                    sr=samplerate, nchnls=channels, buffersize=buffersize, duplex=0
-                )
+                sr=samplerate, nchnls=channels, buffersize=buffersize, duplex=0
+            )
         else:
             _SERVER = pyo.Server(
-                    sr=samplerate,
-                    nchnls=channels,
-                    buffersize=buffersize,
-                    duplex=0,
-                    winhost="asio",
-                ).boot()
+                sr=samplerate,
+                nchnls=channels,
+                buffersize=buffersize,
+                duplex=0,
+                winhost="asio",
+            ).boot()
             _SERVER.start()
             _LIB_VERSION = ".".join(str(v) for v in pyo.getVersion())
 
+
 def _init_pyglet() -> None:
     """Initialize pyglet audio subsystem."""
     global _SERVER, _LIB, _LIB_VERSION, pyglet
     if not getattr(sys, "frozen", False):
-            # Use included pyglet
+        # Use included pyglet
         lib_dir = os.path.join(os.path.dirname(__file__), "lib")
         if lib_dir not in sys.path:
             sys.path.insert(0, lib_dir)
@@ -368,10 +368,10 @@ def _init_pyglet() -> None:
     except ImportError:
         _LIB = None
     else:
-            # Work around localization preventing fallback to RIFFSourceLoader
+        # Work around localization preventing fallback to RIFFSourceLoader
         pyglet.lib.LibraryLoader.darwin_not_found_error = ""
         pyglet.lib.LibraryLoader.linux_not_found_error = ""
-            # Set audio driver preference
+        # Set audio driver preference
         pyglet.options["audio"] = ("pulse", "openal", "directsound", "silent")
         _SERVER = pyglet.media
         _LIB_VERSION = pyglet.version
@@ -729,7 +729,6 @@ def is_playing(self) -> bool:
             return bool(self._ch is not None and self._server.Mix_Playing(self._ch))
         return self._is_playing
 
-
     def _play_pyglet(self, fade_ms: int = 0, stop_already_playing: bool = True) -> bool:
         """Play the sound using pyglet.
 

DisplayCAL/colormath.py

@@ -1588,9 +1588,7 @@ def is_similar_matrix(
         bool: True if the matrices are equal up to the specified number of
             digits, False otherwise.
     """
-    result = matrix1.rounded(digits) == matrix2.rounded(digits)
-    print(f"result: {result}")
-    return result
+    return matrix1.rounded(digits) == matrix2.rounded(digits)
 
 
 def is_equal(

DisplayCAL/config.py

@@ -522,7 +522,6 @@ def load_bitmap(
     from DisplayCAL.wx_addons import wx
 
     bmp = None
-    path = None
     width, height, orig_name, name2x, name4x, color, inverted, size = (
         extract_image_properties(parts)
     )
@@ -544,7 +543,7 @@ def load_bitmap(
         if not bmp.IsOk():
             path = None
     if path:
-        width, height, path = resize_and_adjust_bitmap(
+        width, height, path, bmp = resize_and_adjust_bitmap(
             path,
             parts,
             orig_name,
@@ -864,7 +863,7 @@ def resize_and_adjust_bitmap(
         bmp = img.ConvertToBitmap()
         if not bmp.IsOk():
             path = None
-    return width, height, path
+    return width, height, path, bmp
 
 
 def adjust_bitmap_size(
@@ -2036,7 +2035,7 @@ def getcfg(
         and (name != "testchart.file" or value != "auto")
         and (not os.path.isabs(value) or not os.path.exists(value))
     ):
-        value = get_corrected_colorimeter_path(name, defval, has_default, value)
+        value = get_corrected_colorimeter_path(name, value)
     elif name in ("displays", "instruments"):
         if not value:
             return []

DisplayCAL/demjson_compat.py

@@ -141,7 +141,6 @@ def handle_forward_slash_char(self) -> None:
             debug_print("<EXPECT_COMMENT>")
             self.expect_comment = True
 
-
     def handle_multiline_comment(self) -> None:
         """Handle the start of a multiline comment."""
         if self.expect_comment: