Fix LocalServer on MacOS py3.10 and earlier (#1003)

* Fix LocalServer on MacOS py3.10 and earlier * Remove reference to MacOSXOSAScript * Update changelog.d/20240712_133910_derek_fix_local_server_login_on_mac.rst Co-authored-by: Kurt McKee <[email protected]> --------- Co-authored-by: Kurt McKee <[email protected]>
globus · Jul 12, 2024 · ccb264b · ccb264b
1 parent faa3efe
commit ccb264b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/changelog.d/20240712_133910_derek_fix_local_server_login_on_mac.rst b/changelog.d/20240712_133910_derek_fix_local_server_login_on_mac.rst
@@ -0,0 +1,6 @@
+
+Fixed
+~~~~~
+
+- Fixed a GlobusApp bug which would cause LocalServerLoginFlowManager to error on
+  MacOS when versions earlier than Python 3.11. (:pr:`NUMBER`)
diff --git a/src/globus_sdk/experimental/login_flow_manager/local_server_login_flow_manager.py b/src/globus_sdk/experimental/login_flow_manager/local_server_login_flow_manager.py
@@ -56,14 +56,23 @@ def _open_webbrowser(url: str) -> None:
     """
     try:
         browser = webbrowser.get()
-        if browser.name in BROWSER_BLACKLIST:
+        if hasattr(browser, "name"):
+            browser_name = browser.name
+        elif hasattr(browser, "_name"):
+            # MacOSXOSAScript only supports a public name attribute in py311 and later.
+            # https://github.com/python/cpython/issues/82828
+            browser_name = browser._name
+        else:
+            raise LocalServerLoginFlowError("Unable to determine local browser name.")
+
+        if browser_name in BROWSER_BLACKLIST:
             raise LocalServerLoginFlowError(
                 "Cannot use LocalServerLoginFlowManager with "
-                f"text-only browser '{browser.name}'"
+                f"text-only browser '{browser_name}'"
             )
 
         if not browser.open(url, new=1):
-            raise LocalServerLoginFlowError("Failed to open browser '{browser.name}'")
+            raise LocalServerLoginFlowError(f"Failed to open browser '{browser_name}'")
     except webbrowser.Error as exc:
         raise LocalServerLoginFlowError("Failed to open browser") from exc