Fix some ruff issues with import (rule UP35 not activated yet)

Carreau · Carreau · commit 6f51fbe32ff4 · 2025-10-24T10:27:43.000+02:00
diff --git a/IPython/core/completer.py b/IPython/core/completer.py
@@ -201,17 +201,14 @@
 from functools import cached_property, partial
 from types import SimpleNamespace
 from typing import (
-    Iterable,
-    Iterator,
     Union,
     Any,
-    Sequence,
     Optional,
     TYPE_CHECKING,
-    Sized,
     TypeVar,
     Literal,
 )
+from collections.abc import Iterable, Iterator, Sequence, Sized
 
 from IPython.core.guarded_eval import (
     guarded_eval,
@@ -247,7 +244,8 @@
 from typing import cast
 
 if sys.version_info < (3, 12):
-    from typing_extensions import TypedDict, NotRequired, Protocol, TypeAlias, TypeGuard
+    from typing_extensions import TypedDict, Protocol
+    from typing import NotRequired, TypeAlias, TypeGuard
 else:
     from typing import TypedDict, NotRequired, Protocol, TypeAlias, TypeGuard
 
diff --git a/IPython/core/doctb.py b/IPython/core/doctb.py
@@ -3,7 +3,8 @@
 import sys
 from collections.abc import Sequence
 from types import TracebackType
-from typing import Any, Callable, Optional
+from typing import Any, Optional
+from collections.abc import Callable
 
 import stack_data
 from pygments.formatters.terminal256 import Terminal256Formatter
diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
@@ -3,19 +3,18 @@
 from typing import (
     Annotated,
     AnyStr,
-    Callable,
     Literal,
     NamedTuple,
     NewType,
     Optional,
     Protocol,
-    Sequence,
     TypeGuard,
     Union,
     get_args,
     get_origen,
     is_typeddict,
 )
+from collections.abc import Callable, Sequence
 import ast
 import builtins
 import collections
diff --git a/IPython/core/history.py b/IPython/core/history.py
@@ -35,7 +35,8 @@
 
 from IPython.paths import locate_profile
 from IPython.utils.decorators import undoc
-from typing import Iterable, Tuple, Optional, TYPE_CHECKING
+from typing import Tuple, Optional, TYPE_CHECKING
+from collections.abc import Iterable
 import typing
 from warnings import warn
 from weakref import ref, WeakSet
@@ -1058,7 +1059,7 @@ def writeout_cache(self, conn: Optional[sqlite3.Connection] = None) -> None:
                 self.db_output_cache = []
 
 
-from typing import Callable, Iterator
+from collections.abc import Callable, Iterator
 from weakref import ReferenceType
 
 
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
@@ -32,9 +32,10 @@
 from io import open as io_open
 from logging import error
 from pathlib import Path
-from typing import Callable
+from collections.abc import Callable
 from typing import List as ListType, Any as AnyType
-from typing import Literal, Optional, Sequence, Tuple
+from typing import Literal, Optional, Tuple
+from collections.abc import Sequence
 from warnings import warn
 
 from IPython.external.pickleshare import PickleShareDB
diff --git a/IPython/core/tbtools.py b/IPython/core/tbtools.py
@@ -5,7 +5,8 @@
 import types
 import warnings
 from types import TracebackType
-from typing import Any, Callable, Optional, Tuple
+from typing import Any, Optional, Tuple
+from collections.abc import Callable
 
 import stack_data
 from pygments.token import Token
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
@@ -76,7 +76,8 @@
 import warnings
 from collections.abc import Sequence
 from types import TracebackType
-from typing import Any, Callable, List, Optional, Tuple
+from typing import Any, List, Optional, Tuple
+from collections.abc import Callable
 
 import stack_data
 from pygments.formatters.terminal256 import Terminal256Formatter
diff --git a/IPython/extensions/deduperreload/deduperreload.py b/IPython/extensions/deduperreload/deduperreload.py
@@ -9,7 +9,8 @@
 import sys
 import textwrap
 from types import ModuleType
-from typing import TYPE_CHECKING, Any, Generator, Iterable, NamedTuple, cast
+from typing import TYPE_CHECKING, Any, NamedTuple, cast
+from collections.abc import Generator, Iterable
 
 from IPython.extensions.deduperreload.deduperreload_patching import (
     DeduperReloaderPatchingMixin,
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
@@ -8,7 +8,8 @@
 
 from IPython.core.display import DisplayObject, TextDisplayObject
 
-from typing import Tuple, Iterable, Optional
+from typing import Tuple, Optional
+from collections.abc import Iterable
 
 __all__ = ['Audio', 'IFrame', 'YouTubeVideo', 'VimeoVideo', 'ScribdDocument',
            'FileLink', 'FileLinks', 'Code']
diff --git a/IPython/terminal/pt_inputhooks/__init__.py b/IPython/terminal/pt_inputhooks/__init__.py
@@ -1,6 +1,7 @@
 import importlib
 import os
-from typing import Tuple, Callable
+from typing import Tuple
+from collections.abc import Callable
 
 aliases = {
     'qt4': 'qt',
diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
@@ -11,7 +11,8 @@
 import sys
 import warnings
 from dataclasses import dataclass
-from typing import Callable, Any, Optional, List
+from typing import Any, Optional, List
+from collections.abc import Callable
 
 from prompt_toolkit.application.current import get_app
 from prompt_toolkit.key_binding import KeyBindings
diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
@@ -2,7 +2,8 @@
 import asyncio
 import tokenize
 from io import StringIO
-from typing import Callable, List, Optional, Union, Generator, Tuple, ClassVar, Any
+from typing import List, Optional, Union, Tuple, ClassVar, Any
+from collections.abc import Callable, Generator
 import warnings
 
 import prompt_toolkit
diff --git a/IPython/terminal/shortcuts/filters.py b/IPython/terminal/shortcuts/filters.py
@@ -9,7 +9,8 @@
 import re
 import signal
 import sys
-from typing import Callable, Dict, Union
+from typing import Dict, Union
+from collections.abc import Callable
 
 from prompt_toolkit.application.current import get_app
 from prompt_toolkit.enums import DEFAULT_BUFFER, SEARCH_BUFFER
diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -19,18 +19,15 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Dict,
-    Generator,
-    Iterable,
     List,
     Optional,
-    Pattern,
-    Sequence,
     Tuple,
     Type,
     Union,
 )
+from re import Pattern
+from collections.abc import Callable, Generator, Iterable, Sequence
 
 import pytest
 from _pytest import outcomes
diff --git a/IPython/utils/_process_common.py b/IPython/utils/_process_common.py
@@ -18,7 +18,8 @@
 import shlex
 import subprocess
 import sys
-from typing import IO, Any, Callable, List, Union
+from typing import IO, Any, List, Union
+from collections.abc import Callable
 
 from IPython.utils import py3compat
 
diff --git a/IPython/utils/decorators.py b/IPython/utils/decorators.py
@@ -16,7 +16,7 @@
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
-from typing import Sequence
+from collections.abc import Sequence
 
 from IPython.utils.docs import GENERATING_DOCUMENTATION
 
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
@@ -22,17 +22,14 @@
     Tuple,
     Optional,
     cast,
-    Sequence,
-    Mapping,
     Any,
     Union,
-    Callable,
-    Iterator,
     TypeVar,
 )
+from collections.abc import Sequence, Mapping, Callable, Iterator
 
 if sys.version_info < (3, 12):
-    from typing_extensions import Self
+    from typing import Self
 else:
     from typing import Self
 
diff --git a/IPython/utils/tokenutil.py b/IPython/utils/tokenutil.py
@@ -9,7 +9,8 @@
 from io import StringIO
 from keyword import iskeyword
 from tokenize import TokenInfo
-from typing import Generator, NamedTuple
+from typing import NamedTuple
+from collections.abc import Generator
 
 
 class Token(NamedTuple):
diff --git a/examples/auto_suggest_llm.py b/examples/auto_suggest_llm.py
@@ -66,7 +66,8 @@
 
 import asyncio
 import textwrap
-from typing import Any, AsyncIterable, AsyncIterator
+from typing import Any
+from collections.abc import AsyncIterable, AsyncIterator
 
 from jupyter_ai_magics.models.completion import (
     InlineCompletionList,
