Fix ruff and mypy issues in MonkeyType annotations

claude · Carreau · commit 56c48006e88c · 2026-03-19T14:11:34.000+01:00
- ipstruct.py: remove duplicate `from typing import Any` (ruff F811) - skipdoctest.py: type skip_doctest param/return as Any since Callable doesn't allow arbitrary attribute assignment (__skip_doctest__) - path.py: fix get_xdg_dir return type str -> str | None (function returns None on non-posix or non-writable xdg dir) https://claude.ai/code/session_01L2i6WEqHEX3HyCMWgimmEp
diff --git a/IPython/testing/skipdoctest.py b/IPython/testing/skipdoctest.py
@@ -4,13 +4,13 @@
 numpy and sympy if they're present. Since this decorator is used in core parts
 of IPython, it's in a separate module so that running IPython doesn't trigger
 those imports."""
-from typing import Callable
+from typing import Any, Callable
 
 # Copyright (C) IPython Development Team
 # Distributed under the terms of the Modified BSD License.
 
 
-def skip_doctest(f: Callable) -> Callable:
+def skip_doctest(f: Any) -> Any:
     """Decorator - mark a function or method for skipping its doctest.
 
     This decorator allows you to mark a function whose docstring you wish to
diff --git a/IPython/utils/ipstruct.py b/IPython/utils/ipstruct.py
@@ -7,7 +7,6 @@
 * Brian Granger (refactoring to a dict subclass)
 """
 from typing import Any
-from typing import Any
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2008-2011  The IPython Development Team
diff --git a/IPython/utils/path.py b/IPython/utils/path.py
@@ -196,7 +196,7 @@ def get_home_dir(require_writable: bool=False) -> str:
         raise HomeDirError('%s is not a writable dir, '
                 'set $HOME environment variable to override' % homedir)
 
-def get_xdg_dir() -> str:
+def get_xdg_dir() -> str | None:
     """Return the XDG_CONFIG_HOME, if it is defined and exists, else None.
 
     This is only for non-OS X posix (Linux,Unix,etc.) systems.
