fix(macos): address third round of Copilot review feedback

Author: ShresthSamyak

mpv.py

@@ -1056,6 +1056,7 @@ def _wait_for_future(self, result, timeout):
 
             global _core_foundation
             global _cf_runloop_default_mode
+            start_time = time.monotonic()
             try:
                 if _core_foundation is None or _cf_runloop_default_mode is None:
                     _core_foundation = ctypes.cdll.LoadLibrary(ctypes.util.find_library('CoreFoundation'))
@@ -1066,7 +1067,6 @@ def _wait_for_future(self, result, timeout):
 
                     _cf_runloop_default_mode = ctypes.c_void_p.in_dll(_core_foundation, 'kCFRunLoopDefaultMode')
 
-                start_time = time.monotonic()
                 while not result.done():
                     remaining = 0
                     if timeout is not None:
@@ -1086,7 +1086,11 @@ def _wait_for_future(self, result, timeout):
             except Exception as e:
                 # Fallback if CoreFoundation loading fails: use standard waiting behavior
                 warn(f"Failed to load CoreFoundation for mpv macOS event loop: {e}", RuntimeWarning)
-                return result.result(timeout)
+                if timeout is not None:
+                    fallback_timeout = max(0.0, timeout - (time.monotonic() - start_time))
+                else:
+                    fallback_timeout = None
+                return result.result(fallback_timeout)
 
             return result.result(0 if timeout is not None else None)
         else:
@@ -1175,13 +1179,13 @@ def target_handler(evt):
                 rv = cond(evt)
                 if rv:
                     result.set_result(rv)
+            except InvalidStateError:  # type: ignore
+                pass
             except Exception as e:
                 try:
                     result.set_exception(e)
                 except InvalidStateError:
                     pass
-            except InvalidStateError:  # type: ignore
-                pass
 
         err_unregister = self._set_error_handler(result)
 
@@ -1673,7 +1677,7 @@ def unregister_message_handler(self, target_or_handler):
         if isinstance(target_or_handler, str):
             del self._message_handlers[target_or_handler]  # pyre-ignore
         else:
-            for key, val in self._message_handlers.items():
+            for key, val in list(self._message_handlers.items()):
                 if val == target_or_handler:
                     del self._message_handlers[key]  # pyre-ignore
 

tests/test_mpv.py

@@ -1013,6 +1013,8 @@ def test_macos_wait_for_future(self):
             mock_in_dll.return_value = mock.Mock()
 
             # Reset globals from mpv module to force re-initialization
+            orig_cf = mpv._core_foundation
+            orig_mode = mpv._cf_runloop_default_mode
             mpv._core_foundation = None
             mpv._cf_runloop_default_mode = None
 
@@ -1023,12 +1025,17 @@ def resolve_future():
                 except InvalidStateError:
                     pass
 
-            threading.Thread(target=resolve_future).start()
-            
-            res = self.m._wait_for_future(future, timeout=1.0)
-            
-            self.assertEqual(res, 'success')
-            self.assertTrue(mock_cf.CFRunLoopRunInMode.called)
+            thread = threading.Thread(target=resolve_future)
+            thread.start()
+            try:
+                res = self.m._wait_for_future(future, timeout=1.0)
+                
+                self.assertEqual(res, 'success')
+                self.assertTrue(mock_cf.CFRunLoopRunInMode.called)
+            finally:
+                thread.join(timeout=1.0)
+                mpv._core_foundation = orig_cf
+                mpv._cf_runloop_default_mode = orig_mode
 
     @mock.patch('sys.platform', 'darwin')
     def test_macos_wait_for_future_timeout(self):
@@ -1048,11 +1055,17 @@ def test_macos_wait_for_future_timeout(self):
             mock_load_library.return_value = mock_cf
             mock_in_dll.return_value = mock.Mock()
 
+            orig_cf = mpv._core_foundation
+            orig_mode = mpv._cf_runloop_default_mode
             mpv._core_foundation = None
             mpv._cf_runloop_default_mode = None
 
             from concurrent.futures import TimeoutError
-            with self.assertRaises(TimeoutError):
-                self.m._wait_for_future(future, timeout=0.1)
-                
-            self.assertTrue(mock_cf.CFRunLoopRunInMode.called)
+            try:
+                with self.assertRaises(TimeoutError):
+                    self.m._wait_for_future(future, timeout=0.1)
+                    
+                self.assertTrue(mock_cf.CFRunLoopRunInMode.called)
+            finally:
+                mpv._core_foundation = orig_cf
+                mpv._cf_runloop_default_mode = orig_mode