STY: Use subscriptable collections.abc types over the generic aliases in …

BvB93 · BvB93 · commit fe361df62b10 · 2021-12-23T21:15:00.000+01:00
diff --git a/numpy/__init__.pyi b/numpy/__init__.pyi
@@ -167,26 +167,25 @@ from numpy.typing._extended_precision import (
     complex512 as complex512,
 )
 
-from typing import (
-    Literal as L,
-    Any,
-    ByteString,
+from collections.abc import (
     Callable,
     Container,
-    Callable,
-    Generic,
-    IO,
     Iterable,
     Iterator,
     Mapping,
-    NoReturn,
-    overload,
     Sequence,
     Sized,
+)
+from typing import (
+    Literal as L,
+    Any,
+    Generic,
+    IO,
+    NoReturn,
+    overload,
     SupportsComplex,
     SupportsFloat,
     SupportsInt,
-    Text,
     TypeVar,
     Union,
     Protocol,
diff --git a/numpy/_pytesttester.pyi b/numpy/_pytesttester.pyi
@@ -1,4 +1,5 @@
-from typing import Iterable, Literal as L
+from collections.abc import Iterable
+from typing import Literal as L
 
 __all__: list[str]
 
diff --git a/numpy/core/_asarray.pyi b/numpy/core/_asarray.pyi
@@ -1,4 +1,5 @@
-from typing import TypeVar, Union, Iterable, overload, Literal
+from collections.abc import Iterable
+from typing import TypeVar, Union, overload, Literal
 
 from numpy import ndarray
 from numpy.typing import ArrayLike, DTypeLike
diff --git a/numpy/core/_ufunc_config.pyi b/numpy/core/_ufunc_config.pyi
@@ -1,4 +1,5 @@
-from typing import Callable, Any, Literal, TypedDict
+from collections.abc import Callable
+from typing import Any, Literal, TypedDict
 
 from numpy import _SupportsWrite
 
diff --git a/numpy/core/arrayprint.pyi b/numpy/core/arrayprint.pyi
@@ -1,5 +1,6 @@
 from types import TracebackType
-from typing import Any, Callable, Literal, TypedDict, SupportsIndex
+from collections.abc import Callable
+from typing import Any, Literal, TypedDict, SupportsIndex
 
 # Using a private class is by no means ideal, but it is simply a consequence
 # of a `contextlib.context` returning an instance of aforementioned class
diff --git a/numpy/core/einsumfunc.pyi b/numpy/core/einsumfunc.pyi
@@ -1,4 +1,5 @@
-from typing import TypeVar, Any, overload, Union, Sequence, Literal
+from collections.abc import Sequence
+from typing import TypeVar, Any, overload, Union, Literal
 
 from numpy import (
     ndarray,
diff --git a/numpy/core/fromnumeric.pyi b/numpy/core/fromnumeric.pyi
@@ -1,5 +1,6 @@
 import datetime as dt
-from typing import Union, Sequence, Any, overload, TypeVar, Literal
+from collections.abc import Sequence
+from typing import Union, Any, overload, TypeVar, Literal
 
 from numpy import (
     ndarray,
diff --git a/numpy/core/multiarray.pyi b/numpy/core/multiarray.pyi
@@ -2,15 +2,13 @@
 
 import os
 import datetime as dt
+from collections.abc import Sequence, Callable, Iterable
 from typing import (
     Literal as L,
     Any,
-    Callable,
-    Iterable,
     overload,
     TypeVar,
     Union,
-    Sequence,
     SupportsIndex,
     final,
     Final,
diff --git a/numpy/core/numeric.pyi b/numpy/core/numeric.pyi
@@ -1,8 +1,7 @@
+from collections.abc import Callable, Sequence
 from typing import (
     Any,
     Union,
-    Sequence,
-    Callable,
     overload,
     TypeVar,
     Literal,
diff --git a/numpy/core/numerictypes.pyi b/numpy/core/numerictypes.pyi
@@ -1,12 +1,12 @@
 import sys
 import types
+from collections.abc import Iterable
 from typing import (
     Literal as L,
     Union,
     overload,
     Any,
     TypeVar,
-    Iterable,
     Protocol,
     TypedDict,
 )
diff --git a/numpy/core/records.pyi b/numpy/core/records.pyi
@@ -1,9 +1,8 @@
 import os
+from collections.abc import Sequence, Iterable
 from typing import (
-    Sequence,
     Any,
     TypeVar,
-    Iterable,
     overload,
     Protocol,
 )
diff --git a/numpy/core/shape_base.pyi b/numpy/core/shape_base.pyi
@@ -1,4 +1,5 @@
-from typing import TypeVar, overload, Sequence, Any, SupportsIndex
+from collections.abc import Sequence
+from typing import TypeVar, overload, Any, SupportsIndex
 
 from numpy import generic, dtype
 from numpy.typing import ArrayLike, NDArray, _FiniteNestedSequence, _SupportsArray
diff --git a/numpy/ctypeslib.pyi b/numpy/ctypeslib.pyi
@@ -5,16 +5,15 @@ from ctypes import c_int64 as _c_intp
 import os
 import sys
 import ctypes
+from collections.abc import Iterable, Sequence
 from typing import (
     Literal as L,
     Any,
     Union,
     TypeVar,
     Generic,
     overload,
-    Iterable,
     ClassVar,
-    Sequence,
 )
 
 from numpy import (
diff --git a/numpy/f2py/__init__.pyi b/numpy/f2py/__init__.pyi
@@ -1,6 +1,7 @@
 import os
 import subprocess
-from typing import Literal as L, Any, Iterable, overload, TypedDict
+from collections.abc import Iterable
+from typing import Literal as L, Any, overload, TypedDict
 
 from numpy._pytesttester import PytestTester
 
diff --git a/numpy/fft/_pocketfft.pyi b/numpy/fft/_pocketfft.pyi
@@ -1,7 +1,5 @@
-from typing import (
-    Literal as L,
-    Sequence,
-)
+from collections.abc import Sequence
+from typing import Literal as L
 
 from numpy import complex128, float64
 from numpy.typing import ArrayLike, NDArray, _ArrayLikeNumber_co
diff --git a/numpy/lib/arrayterator.pyi b/numpy/lib/arrayterator.pyi
@@ -1,7 +1,7 @@
+from collections.abc import Generator
 from typing import (
     Any,
     TypeVar,
-    Generator,
     Union,
     overload,
 )
diff --git a/numpy/lib/function_base.pyi b/numpy/lib/function_base.pyi
@@ -1,16 +1,13 @@
 import sys
+from collections.abc import Sequence, Iterator, Callable, Iterable
 from typing import (
     Literal as L,
-    Sequence,
     Union,
     Any,
     TypeVar,
-    Iterator,
     overload,
-    Callable,
     Protocol,
     SupportsIndex,
-    Iterable,
     SupportsInt,
 )
 
diff --git a/numpy/lib/histograms.pyi b/numpy/lib/histograms.pyi
@@ -1,8 +1,8 @@
+from collections.abc import Sequence
 from typing import (
     Literal as L,
     Any,
     SupportsIndex,
-    Sequence,
 )
 
 from numpy.typing import (
diff --git a/numpy/lib/index_tricks.pyi b/numpy/lib/index_tricks.pyi
@@ -1,9 +1,9 @@
+from collections.abc import Sequence
 from typing import (
     Any,
     TypeVar,
     Generic,
     overload,
-    Sequence,
     Literal,
     SupportsIndex,
 )
diff --git a/numpy/lib/npyio.pyi b/numpy/lib/npyio.pyi
@@ -2,22 +2,17 @@ import os
 import sys
 import zipfile
 import types
+from re import Pattern
+from collections.abc import Collection, Mapping, Iterator, Sequence, Callable, Iterable
 from typing import (
-    Collection,
     Literal as L,
     Any,
-    Mapping,
     TypeVar,
     Generic,
-    Iterator,
     Union,
     IO,
     overload,
-    Sequence,
-    Callable,
-    Pattern,
     Protocol,
-    Iterable,
 )
 
 from numpy import (
diff --git a/numpy/lib/shape_base.pyi b/numpy/lib/shape_base.pyi
@@ -1,4 +1,5 @@
-from typing import TypeVar, Callable, Sequence, Any, overload, SupportsIndex, Protocol
+from collections.abc import Callable, Sequence
+from typing import TypeVar, Any, overload, SupportsIndex, Protocol
 
 from numpy import (
     generic,
diff --git a/numpy/lib/stride_tricks.pyi b/numpy/lib/stride_tricks.pyi
@@ -1,4 +1,5 @@
-from typing import Any, Iterable, TypeVar, overload, SupportsIndex
+from collections.abc import Iterable
+from typing import Any, TypeVar, overload, SupportsIndex
 
 from numpy import dtype, generic
 from numpy.typing import (
diff --git a/numpy/lib/twodim_base.pyi b/numpy/lib/twodim_base.pyi
@@ -1,7 +1,6 @@
+from collections.abc import Callable, Sequence
 from typing import (
     Any,
-    Callable,
-    Sequence,
     overload,
     TypeVar,
     Union,
diff --git a/numpy/lib/type_check.pyi b/numpy/lib/type_check.pyi
@@ -1,8 +1,7 @@
+from collections.abc import Container, Iterable
 from typing import (
     Literal as L,
     Any,
-    Container,
-    Iterable,
     overload,
     TypeVar,
     Protocol,
diff --git a/numpy/lib/utils.pyi b/numpy/lib/utils.pyi
@@ -1,10 +1,8 @@
 from ast import AST
+from collections.abc import Callable, Mapping, Sequence
 from typing import (
     Any,
-    Callable,
-    Mapping,
     overload,
-    Sequence,
     TypeVar,
     Protocol,
 )
diff --git a/numpy/linalg/__init__.pyi b/numpy/linalg/__init__.pyi
@@ -1,5 +1,3 @@
-from typing import Any
-
 from numpy.linalg.linalg import (
     matrix_power as matrix_power,
     solve as solve,
diff --git a/numpy/linalg/linalg.pyi b/numpy/linalg/linalg.pyi
@@ -1,6 +1,6 @@
+from collections.abc import Iterable
 from typing import (
     Literal as L,
-    Iterable,
     overload,
     TypeVar,
     Any,
diff --git a/numpy/ma/__init__.pyi b/numpy/ma/__init__.pyi
@@ -1,5 +1,3 @@
-from typing import Any
-
 from numpy._pytesttester import PytestTester
 
 from numpy.ma import extras as extras
diff --git a/numpy/ma/core.pyi b/numpy/ma/core.pyi
@@ -1,4 +1,5 @@
-from typing import Any, TypeVar, Callable
+from collections.abc import Callable
+from typing import Any, TypeVar
 from numpy import ndarray, dtype, float64
 
 from numpy import (
diff --git a/numpy/matrixlib/defmatrix.pyi b/numpy/matrixlib/defmatrix.pyi
@@ -1,4 +1,5 @@
-from typing import Any, Sequence, Mapping
+from collections.abc import Sequence, Mapping
+from typing import Any
 from numpy import matrix as matrix
 from numpy.typing import ArrayLike, DTypeLike, NDArray
 
diff --git a/numpy/random/_generator.pyi b/numpy/random/_generator.pyi
@@ -1,4 +1,5 @@
-from typing import Any, Callable, Union, overload, TypeVar, Literal
+from collections.abc import Callable
+from typing import Any, Union, overload, TypeVar, Literal
 
 from numpy import (
     bool_,
diff --git a/numpy/random/bit_generator.pyi b/numpy/random/bit_generator.pyi
@@ -1,11 +1,9 @@
 import abc
 from threading import Lock
+from collections.abc import Callable, Mapping, Sequence
 from typing import (
     Any,
-    Callable,
-    Mapping,
     NamedTuple,
-    Sequence,
     TypedDict,
     TypeVar,
     Union,
diff --git a/numpy/random/mtrand.pyi b/numpy/random/mtrand.pyi
@@ -1,4 +1,5 @@
-from typing import Any, Callable, Union, overload, Literal
+from collections.abc import Callable
+from typing import Any, Union, overload, Literal
 
 from numpy import (
     bool_,
diff --git a/numpy/testing/_private/utils.pyi b/numpy/testing/_private/utils.pyi
@@ -5,17 +5,15 @@ import types
 import warnings
 import unittest
 import contextlib
+from re import Pattern
+from collections.abc import Callable, Iterable, Sequence
 from typing import (
     Literal as L,
     Any,
     AnyStr,
-    Callable,
     ClassVar,
-    Iterable,
     NoReturn,
     overload,
-    Pattern,
-    Sequence,
     type_check_only,
     TypeVar,
     Union,
diff --git a/numpy/typing/_generic_alias.py b/numpy/typing/_generic_alias.py
@@ -2,12 +2,10 @@
 
 import sys
 import types
+from collections.abc import Generator, Iterable, Iterator
 from typing import (
     Any,
     ClassVar,
-    Generator,
-    Iterable,
-    Iterator,
     NoReturn,
     TypeVar,
     TYPE_CHECKING,
diff --git a/numpy/typing/tests/data/fail/arrayprint.pyi b/numpy/typing/tests/data/fail/arrayprint.pyi
@@ -1,4 +1,5 @@
-from typing import Callable, Any
+from collections.abc import Callable
+from typing import Any
 import numpy as np
 
 AR: np.ndarray
diff --git a/numpy/typing/tests/data/pass/literal.py b/numpy/typing/tests/data/pass/literal.py
diff --git a/numpy/typing/tests/data/pass/simple.py b/numpy/typing/tests/data/pass/simple.py
diff --git a/numpy/typing/tests/data/reveal/arrayprint.pyi b/numpy/typing/tests/data/reveal/arrayprint.pyi
diff --git a/numpy/typing/tests/data/reveal/char.pyi b/numpy/typing/tests/data/reveal/char.pyi
diff --git a/numpy/typing/tests/data/reveal/nested_sequence.pyi b/numpy/typing/tests/data/reveal/nested_sequence.pyi
diff --git a/numpy/typing/tests/data/reveal/testing.pyi b/numpy/typing/tests/data/reveal/testing.pyi
diff --git a/numpy/typing/tests/test_generic_alias.py b/numpy/typing/tests/test_generic_alias.py
