Mac: support macOS Big Sur (fixes BoboTiG#178)

Author: BoboTiG

CHANGELOG

@@ -4,6 +4,7 @@ History:
 
 6.0.1   2020/xx/xx
       - Mac: reduce the number of function calls
+      - Mac: support macOS Big Sur (fixes #178)
       - tests: fix macOS intepreter not found on Travis-CI
       - :heart: contributors: @
 

mss/base.py

@@ -164,6 +164,7 @@ def save(self, mon=0, output="monitor-{mon}.png", callback=None):
             try:
                 monitor = monitors[mon]
             except IndexError:
+                # pylint: disable=raise-missing-from
                 raise ScreenShotError("Monitor {!r} does not exist.".format(mon))
 
             output = output.format(mon=mon, date=datetime.now(), **monitor)

mss/darwin.py

@@ -6,6 +6,7 @@
 import ctypes
 import ctypes.util
 import sys
+from platform import mac_ver
 from typing import TYPE_CHECKING
 
 from .base import MSSBase
@@ -72,13 +73,23 @@ def __init__(self, **_):
 
         self.max_displays = 32
 
-        coregraphics = ctypes.util.find_library("CoreGraphics")
+        self._init_library()
+        self._set_cfunctions()
+
+    def _init_library(self):
+        """ Load the CoreGraphics library. """
+        version = float(".".join(mac_ver()[0].split(".")[:2]))
+        if version < 10.16:
+            coregraphics = ctypes.util.find_library("CoreGraphics")
+        else:
+            # macOS Big Sur and newer
+            # pylint: disable=line-too-long
+            coregraphics = "/System/Library/Frameworks/CoreGraphics.framework/Versions/Current/CoreGraphics"
+
         if not coregraphics:
             raise ScreenShotError("No CoreGraphics library found.")
         self.core = ctypes.cdll.LoadLibrary(coregraphics)
 
-        self._set_cfunctions()
-
     def _set_cfunctions(self):
         # type: () -> None
         """ Set all ctypes functions and attach them to attributes. """

mss/linux.py

@@ -197,6 +197,7 @@ def __init__(self, display=None):
             try:
                 display = os.environ["DISPLAY"].encode("utf-8")
             except KeyError:
+                # pylint: disable=raise-missing-from
                 raise ScreenShotError("$DISPLAY not set.")
 
         if not isinstance(display, bytes):

mss/screenshot.py

@@ -152,6 +152,7 @@ def pixel(self, coord_x, coord_y):
         try:
             return self.pixels[coord_y][coord_x]  # type: ignore
         except IndexError:
+            # pylint: disable=raise-missing-from
             raise ScreenShotError(
                 "Pixel location ({}, {}) is out of range.".format(coord_x, coord_y)
             )

mss/tests/test_gnu_linux.py

@@ -37,7 +37,8 @@ def test_factory_systems(monkeypatch):
 
     # macOS
     monkeypatch.setattr(platform, "system", lambda: "Darwin")
-    with pytest.raises(ScreenShotError):
+    with pytest.raises((ScreenShotError, ValueError)):
+        # ValueError on macOS Big Sur
         mss.mss()
     monkeypatch.undo()
 

mss/tests/test_macos.py

@@ -44,10 +44,13 @@ def test_repr():
 
 def test_implementation(monkeypatch):
     # No `CoreGraphics` library
-    monkeypatch.setattr(ctypes.util, "find_library", lambda x: None)
-    with pytest.raises(ScreenShotError):
-        mss.mss()
-    monkeypatch.undo()
+    version = float(".".join(platform.mac_ver()[0].split(".")[:2]))
+
+    if version < 10.16:
+        monkeypatch.setattr(ctypes.util, "find_library", lambda x: None)
+        with pytest.raises(ScreenShotError):
+            mss.mss()
+        monkeypatch.undo()
 
     with mss.mss() as sct:
         # Test monitor's rotation