Ruff cleanups

Author: jholveck

src/mss/linux/__init__.py

@@ -1,7 +1,7 @@
 from typing import Any
 
-from ..base import MSSBase
-from ..exception import ScreenShotError
+from mss.base import MSSBase
+from mss.exception import ScreenShotError
 
 
 def MSS(backend: str = "xlib", **kwargs: Any) -> MSSBase:

src/mss/linux/xcb.py

@@ -31,7 +31,7 @@
     from collections.abc import Callable, Generator
     from typing import Any
 
-from ..exception import ScreenShotError
+from mss.exception import ScreenShotError
 
 # In general, anything global starting with Xcb, XCB_, or xcb_ is a
 # reflection of something in XCB with the same name.
@@ -633,6 +633,7 @@ class XcbRandrGetScreenResourcesCurrentReply(Structure):
         ("pad1", c_uint8 * 8),
     )
 
+
 # The version of the spec that the client was written against.
 XCB_RANDR_MAJOR_VERSION = 1
 XCB_RANDR_MINOR_VERSION = 6
@@ -734,6 +735,7 @@ class XcbRenderQueryPictFormatsReply(Structure):
 
 # xfixes
 
+
 class XcbXfixesQueryVersionReply(Structure):
     _fields_ = (
         ("response_type", c_uint8),
@@ -762,6 +764,7 @@ class XcbXfixesGetCursorImageReply(Structure):
         ("pad1", c_uint8 * 8),
     )
 
+
 # The version of the spec that the client was written against.
 XCB_XFIXES_MAJOR_VERSION = 6
 XCB_XFIXES_MINOR_VERSION = 0
@@ -1070,9 +1073,13 @@ def xcb_render_query_pict_formats(c: XcbConnection) -> XcbRenderQueryPictFormats
 def xcb_render_query_version(c: XcbConnection) -> XcbRenderQueryVersionReply:
     return render.xcb_render_query_version(c).reply(c)
 
-def xcb_xfixes_query_version(c: XcbConnection, client_major_version: c_uint32, client_minor_version: c_uint32) -> XcbXfixesQueryVersionReply:
+
+def xcb_xfixes_query_version(
+    c: XcbConnection, client_major_version: c_uint32, client_minor_version: c_uint32
+) -> XcbXfixesQueryVersionReply:
     return xfixes.xcb_xfixes_query_version(c, client_major_version, client_minor_version).reply(c)
 
+
 def xcb_xfixes_get_cursor_image(c: XcbConnection) -> XcbXfixesGetCursorImageReply:
     return xfixes.xcb_xfixes_get_cursor_image(c).reply(c)
 
@@ -1276,7 +1283,7 @@ def get_utf8_prop(xcb_conn: XcbConnection, window: XcbWindow, prop_name: str) ->
 def connect(display: str | bytes | None = None) -> tuple[XcbConnection, int]:
     if isinstance(display, str):
         display = display.encode("utf-8")
-        
+
     pref_screen_num = c_int()
     conn_p = libxcb.xcb_connect(display, pref_screen_num)
     if libxcb.xcb_connection_has_error(conn_p) != 0:
@@ -1300,6 +1307,7 @@ def disconnect(conn: XcbConnection) -> None:
 
 def main(target_name: str | re.Pattern = "emacs", verbose=True) -> None:
     import re
+
     from PIL import Image
 
     if not isinstance(target_name, re.Pattern):

src/mss/linux/xgetimage.py

@@ -1,37 +1,38 @@
-from typing import Any, TYPE_CHECKING
+from typing import Any
 
-from ..base import MSSBase
-from ..exception import ScreenShotError
-from ..models import Monitor
-from ..screenshot import ScreenShot
+from mss.base import MSSBase
+from mss.exception import ScreenShotError
+from mss.models import Monitor
+from mss.screenshot import ScreenShot
 
 # FIXME: We can't currently import libxcb etc. straight from xcb,
 # since it will update them when we call initialize, and we won't see
 # the changes.  I'm going to change initialize's API to address that.
 from . import xcb
 from .xcb import (
-    initialize,
+    XCB_IMAGE_FORMAT_Z_PIXMAP,
+    XCB_RANDR_MAJOR_VERSION,
+    XCB_RANDR_MINOR_VERSION,
+    XCB_XFIXES_MAJOR_VERSION,
+    XCB_XFIXES_MINOR_VERSION,
     connect,
     disconnect,
-    xcb_setup_roots,
-    xcb_randr_query_version,
+    initialize,
     xcb_get_geometry,
-    xcb_randr_get_screen_resources_current,
-    xcb_randr_get_screen_resources_current_crtcs,
-    xcb_randr_get_crtc_info,
     xcb_get_image,
-    XCB_IMAGE_FORMAT_Z_PIXMAP,
     xcb_get_image_data,
-    xcb_xfixes_query_version,
+    xcb_randr_get_crtc_info,
+    xcb_randr_get_screen_resources,
+    xcb_randr_get_screen_resources_crtcs,
+    xcb_randr_get_screen_resources_current,
+    xcb_randr_get_screen_resources_current_crtcs,
+    xcb_randr_query_version,
+    xcb_setup_roots,
     xcb_xfixes_get_cursor_image,
     xcb_xfixes_get_cursor_image_cursor_image,
-    XCB_RANDR_MAJOR_VERSION,
-    XCB_RANDR_MINOR_VERSION,
-    XCB_XFIXES_MAJOR_VERSION,
-    XCB_XFIXES_MINOR_VERSION,
+    xcb_xfixes_query_version,
 )
 
-
 SUPPORTED_DEPTHS = {24, 32}
 SUPPORTED_BYTES_PER_PIXEL = 32
 ALL_PLANES = 0xFFFFFFFF  # XCB doesn't define AllPlanes
@@ -183,10 +184,7 @@ def _cursor_impl_check_xfixes(self) -> bool:
         # We can work with 2.0 and later, but not sure about the
         # actual minimum version we can use.  That's ok; everything
         # these days is much more modern.
-        if (reply.major_version, reply.minor_version) < (2, 0):
-            return False
-
-        return True
+        return not (reply.major_version, reply.minor_version) < (2, 0)
 
     def _cursor_impl(self) -> ScreenShot:
         """Retrieve all cursor data. Pixels have to be RGBx."""

src/tests/conftest.py

@@ -2,10 +2,10 @@
 Source: https://github.com/BoboTiG/python-mss.
 """
 
+import os
 from collections.abc import Callable, Generator
 from functools import partial
 from hashlib import sha256
-import os
 from pathlib import Path
 from platform import system
 from zipfile import ZipFile
@@ -15,6 +15,7 @@
 from mss import mss
 from mss.base import MSSBase
 
+
 @pytest.fixture(autouse=True)
 def _no_warnings(recwarn: pytest.WarningsRecorder) -> Generator:
     """Fail on warning."""
@@ -53,7 +54,7 @@ def raw() -> bytes:
 
 
 @pytest.fixture(params=["xlib", "xgetimage"] if system() == "Linux" else ["default"])
-def backend(request) -> str:
+def backend(request: pytest.FixtureRequest) -> str:
     return request.param
 
 

src/tests/test_cls_image.py

@@ -3,10 +3,8 @@
 """
 
 from collections.abc import Callable
-import os
 from typing import Any
 
-from mss import mss
 from mss.base import MSSBase
 from mss.models import Monitor
 

src/tests/test_find_monitors.py

@@ -3,9 +3,7 @@
 """
 
 from collections.abc import Callable
-import os
 
-from mss import mss
 from mss.base import MSSBase
 
 

src/tests/test_get_pixels.py

@@ -2,13 +2,11 @@
 Source: https://github.com/BoboTiG/python-mss.
 """
 
-from collections.abc import Callable
 import itertools
-import os
+from collections.abc import Callable
 
 import pytest
 
-from mss import mss
 from mss.base import MSSBase, ScreenShot
 from mss.exception import ScreenShotError
 

src/tests/test_implementation.py

@@ -4,8 +4,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
-import os
 import platform
 import sys
 import threading
@@ -24,6 +22,8 @@
 from mss.screenshot import ScreenShot
 
 if TYPE_CHECKING:  # pragma: nocover
+    from collections.abc import Callable
+
     from mss.models import Monitor
 
 try:
@@ -93,6 +93,7 @@ def test_factory_unknown_system(backend: str, monkeypatch: pytest.MonkeyPatch) -
     error = exc.value.args[0]
     assert error == "System 'chuck norris' not (yet?) implemented."
 
+
 @patch.object(sys, "argv", new=[])  # Prevent side effects while testing
 @pytest.mark.parametrize("with_cursor", [False, True])
 def test_entry_point(with_cursor: bool, capsys: pytest.CaptureFixture, mss_impl: Callable[..., MSSBase]) -> None:

src/tests/test_issue_220.py

@@ -33,7 +33,9 @@ def take_screenshot(*, backend: str) -> None:
 def create_top_level_win(master: tkinter.Tk, backend: str) -> None:  # type: ignore[name-defined]
     top_level_win = tkinter.Toplevel(master)
 
-    take_screenshot_btn = tkinter.Button(top_level_win, text="Take screenshot", command=partial(take_screenshot, backend=backend))
+    take_screenshot_btn = tkinter.Button(
+        top_level_win, text="Take screenshot", command=partial(take_screenshot, backend=backend)
+    )
     take_screenshot_btn.pack()
 
     take_screenshot_btn.invoke()

src/tests/test_save.py

@@ -3,13 +3,11 @@
 """
 
 from collections.abc import Callable
-import os.path
 from datetime import datetime
 from pathlib import Path
 
 import pytest
 
-from mss import mss
 from mss.base import MSSBase
 
 try: