linux: tweaks

Author: BoboTiG

src/mss/__init__.py

@@ -11,7 +11,7 @@
 from .exception import ScreenShotError
 from .factory import mss
 
-__version__ = "8.0.3"
+__version__ = "8.0.4"
 __author__ = "Mickaël 'Tiger-222' Schoentgen"
 __copyright__ = """
 Copyright (c) 2013-2023, Mickaël 'Tiger-222' Schoentgen

src/mss/linux.py

@@ -223,7 +223,7 @@ def _error_handler(display: Display, event: XErrorEvent) -> int:
 
 
 def _validate(retval: int, func: Any, args: Tuple[Any, Any], /) -> Tuple[Any, Any]:
-    """Validate the returned value of a Xlib or XRANDR function."""
+    """Validate the returned value of a C function call."""
 
     thread = current_thread()
     if retval != 0 and thread not in _ERROR:
@@ -331,7 +331,7 @@ def __init__(self, /, **kwargs: Any) -> None:
 
     def close(self) -> None:
         # Remove our error handler
-        if self._handles.original_error_handler is not None:
+        if self._handles.original_error_handler:
             # It's required when exiting MSS to prevent letting `_error_handler()` as default handler.
             # Doing so would crash when using Tk/Tkinter, see issue #220.
             # Interesting technical stuff can be found here:
@@ -341,7 +341,7 @@ def close(self) -> None:
             self._handles.original_error_handler = None
 
         # Clean-up
-        if self._handles.display is not None:
+        if self._handles.display:
             self.xlib.XCloseDisplay(self._handles.display)
             self._handles.display = None
             self._handles.drawable = None

tests-requirements.txt

@@ -1,6 +1,6 @@
-pytest
-pytest-cov
 numpy
 pillow
+pytest
+pytest-cov
+pyvirtualdisplay; sys_platform == "linux"
 sphinx
-PyVirtualDisplay; sys_platform == "linux"