Update pywebview requirement to avoid crash on older macOS

simonrob · simonrob · commit 56d89d13aa00 · 2023-03-22T17:25:25.000Z
diff --git a/emailproxy.py b/emailproxy.py
@@ -2461,10 +2461,13 @@ def handle_authorisation_windows(self):
         setattr(webview.platforms.cocoa.BrowserView.BrowserDelegate, 'webView_didReceiveServerRedirectForProvisional'
                                                                      'Navigation_',
                 ProvisionalNavigationBrowserDelegate.webView_didReceiveServerRedirectForProvisionalNavigation_)
-        setattr(webview.platforms.cocoa.BrowserView.WebKitHost, 'performKeyEquivalentBase_',
-                webview.platforms.cocoa.BrowserView.WebKitHost.performKeyEquivalent_)
-        setattr(webview.platforms.cocoa.BrowserView.WebKitHost, 'performKeyEquivalent_',
-                ProvisionalNavigationBrowserDelegate.performKeyEquivalent_)
+        try:
+            setattr(webview.platforms.cocoa.BrowserView.WebKitHost, 'performKeyEquivalentBase_',
+                    webview.platforms.cocoa.BrowserView.WebKitHost.performKeyEquivalent_)
+            setattr(webview.platforms.cocoa.BrowserView.WebKitHost, 'performKeyEquivalent_',
+                    ProvisionalNavigationBrowserDelegate.performKeyEquivalent_)
+        except TypeError:
+            pass
 
         # also needed only on macOS because otherwise closing the last remaining webview window exits the application
         dummy_window = webview.create_window('%s hidden (dummy) window' % APP_NAME, html='<html></html>', hidden=True)
diff --git a/requirements.txt b/requirements.txt
@@ -8,9 +8,10 @@ timeago  # for displaying the last authenticated activity hint
 # force pystray version with dummy GUI fix for headless deployments (https://github.com/moses-palmer/pystray/issues/118)
 pystray>=0.19.4
 
-# force pywebview 4.0.2+ on Windows to fix PyInstaller/pythonw issue (https://github.com/r0x0r/pywebview/issues/1044)
-pywebview; sys_platform != 'win32'  # (specify platform to avoid double requirement error with older pip versions)
-pywebview>=4.0.2; sys_platform == 'win32'
+# force pywebview 4.0.2+ to fix Windows issue with PyInstaller/pythonw (https://github.com/r0x0r/pywebview/issues/1044)
+# and macOS pre-Mojave crash when opening browser windows (https://github.com/r0x0r/pywebview/pull/1047) - we could do,
+# e.g., platform_release < '18' to allow Linux and other macOS versions more flexibility, but that seems over-the-top
+pywebview>=4.0.2
 
 # macOS: improve menu bar interaction, provide native notifications and handle system events
 pyobjc-framework-Cocoa; sys_platform == 'darwin'
