Skip to content

Commit 79a9541

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 0ae56f3 commit 79a9541

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+152
-167
lines changed

scripts/generate-gh-release-notes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
from __future__ import annotations
1313

14+
from collections.abc import Sequence
1415
from pathlib import Path
1516
import re
1617
import sys
17-
from typing import Sequence
1818

1919
import pypandoc
2020

scripts/update-plugin-list.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# mypy: disallow-untyped-defs
22
from __future__ import annotations
33

4+
from collections.abc import Iterable
5+
from collections.abc import Iterator
46
import datetime
57
import pathlib
68
import re
79
from textwrap import dedent
810
from textwrap import indent
911
from typing import Any
10-
from typing import Iterable
11-
from typing import Iterator
1212
from typing import TypedDict
1313

1414
import packaging.version

src/_pytest/_code/code.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
from __future__ import annotations
33

44
import ast
5+
from collections.abc import Iterable
6+
from collections.abc import Mapping
7+
from collections.abc import Sequence
58
import dataclasses
69
import inspect
710
from inspect import CO_VARARGS
@@ -10,6 +13,7 @@
1013
import os
1114
from pathlib import Path
1215
import re
16+
from re import Pattern
1317
import sys
1418
import traceback
1519
from traceback import format_exception_only
@@ -22,16 +26,9 @@
2226
from typing import Final
2327
from typing import final
2428
from typing import Generic
25-
from typing import Iterable
26-
from typing import List
2729
from typing import Literal
28-
from typing import Mapping
2930
from typing import overload
30-
from typing import Pattern
31-
from typing import Sequence
3231
from typing import SupportsIndex
33-
from typing import Tuple
34-
from typing import Type
3532
from typing import TypeVar
3633
from typing import Union
3734

@@ -56,7 +53,7 @@
5653

5754
TracebackStyle = Literal["long", "short", "line", "no", "native", "value", "auto"]
5855

59-
EXCEPTION_OR_MORE = Union[Type[BaseException], Tuple[Type[BaseException], ...]]
56+
EXCEPTION_OR_MORE = Union[type[BaseException], tuple[type[BaseException], ...]]
6057

6158

6259
class Code:
@@ -320,7 +317,7 @@ def name(self) -> str:
320317
return self.frame.code.raw.co_name
321318

322319

323-
class Traceback(List[TracebackEntry]):
320+
class Traceback(list[TracebackEntry]):
324321
"""Traceback objects encapsulate and offer higher level access to Traceback entries."""
325322

326323
def __init__(

src/_pytest/_code/source.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
import ast
55
from bisect import bisect_right
6+
from collections.abc import Iterable
7+
from collections.abc import Iterator
68
import inspect
79
import textwrap
810
import tokenize
911
import types
10-
from typing import Iterable
11-
from typing import Iterator
1212
from typing import overload
1313
import warnings
1414

src/_pytest/_io/pprint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
from __future__ import annotations
1717

1818
import collections as _collections
19+
from collections.abc import Iterator
1920
import dataclasses as _dataclasses
2021
from io import StringIO as _StringIO
2122
import re
2223
import types as _types
2324
from typing import Any
2425
from typing import Callable
2526
from typing import IO
26-
from typing import Iterator
2727

2828

2929
class _safe_key:

src/_pytest/_io/terminalwriter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
from __future__ import annotations
44

5+
from collections.abc import Sequence
56
import os
67
import shutil
78
import sys
89
from typing import final
910
from typing import Literal
10-
from typing import Sequence
1111
from typing import TextIO
1212
from typing import TYPE_CHECKING
1313

src/_pytest/assertion/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
from __future__ import annotations
55

6+
from collections.abc import Generator
67
import sys
78
from typing import Any
8-
from typing import Generator
99
from typing import TYPE_CHECKING
1010

1111
from _pytest.assertion import rewrite

src/_pytest/assertion/rewrite.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
import ast
66
from collections import defaultdict
7+
from collections.abc import Iterable
8+
from collections.abc import Iterator
9+
from collections.abc import Sequence
710
import errno
811
import functools
912
import importlib.abc
@@ -21,9 +24,6 @@
2124
import types
2225
from typing import Callable
2326
from typing import IO
24-
from typing import Iterable
25-
from typing import Iterator
26-
from typing import Sequence
2727
from typing import TYPE_CHECKING
2828

2929
from _pytest._io.saferepr import DEFAULT_REPR_MAX_SIZE

src/_pytest/assertion/util.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
from __future__ import annotations
55

66
import collections.abc
7+
from collections.abc import Iterable
8+
from collections.abc import Mapping
9+
from collections.abc import Sequence
710
import os
811
import pprint
912
from typing import AbstractSet
1013
from typing import Any
1114
from typing import Callable
12-
from typing import Iterable
1315
from typing import Literal
14-
from typing import Mapping
1516
from typing import Protocol
16-
from typing import Sequence
1717
from unicodedata import normalize
1818

1919
from _pytest import outcomes

src/_pytest/cacheprovider.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
# pytest-cache version.
66
from __future__ import annotations
77

8+
from collections.abc import Generator
9+
from collections.abc import Iterable
810
import dataclasses
911
import errno
1012
import json
1113
import os
1214
from pathlib import Path
1315
import tempfile
1416
from typing import final
15-
from typing import Generator
16-
from typing import Iterable
1717

1818
from .pathlib import resolve_from_str
1919
from .pathlib import rm_rf

0 commit comments

Comments
 (0)