From 8ff3c6dfe6207dc79ed7be5105675d2f08725b76 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Thu, 5 Jan 2023 07:12:49 -0500
Subject: mypy: Iterator is better than Generator

---
 tests/conftest.py      | 10 +++++-----
 tests/coveragetest.py  |  4 ++--
 tests/helpers.py       |  8 ++++----
 tests/test_execfile.py |  4 ++--
 tests/test_files.py    |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'tests')

diff --git a/tests/conftest.py b/tests/conftest.py
index 9b10514b..41db85b4 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -15,7 +15,7 @@ import sysconfig
 import warnings
 
 from pathlib import Path
-from typing import Generator, Optional
+from typing import Iterator, Optional
 
 import pytest
 
@@ -65,7 +65,7 @@ def set_warnings() -> None:
 
 
 @pytest.fixture(autouse=True)
-def reset_sys_path() -> Generator[None, None, None]:
+def reset_sys_path() -> Iterator[None]:
     """Clean up sys.path changes around every test."""
     sys_path = list(sys.path)
     yield
@@ -73,7 +73,7 @@ def reset_sys_path() -> Generator[None, None, None]:
 
 
 @pytest.fixture(autouse=True)
-def reset_environment() -> Generator[None, None, None]:
+def reset_environment() -> Iterator[None]:
     """Make sure a test setting an envvar doesn't leak into another test."""
     old_environ = os.environ.copy()
     yield
@@ -82,7 +82,7 @@ def reset_environment() -> Generator[None, None, None]:
 
 
 @pytest.fixture(autouse=True)
-def reset_filesdotpy_globals() -> Generator[None, None, None]:
+def reset_filesdotpy_globals() -> Iterator[None]:
     """coverage/files.py has some unfortunate globals. Reset them every test."""
     set_relative_directory()
     yield
@@ -110,7 +110,7 @@ def pytest_sessionfinish() -> None:
                 pth_file.unlink()
 
 
-def possible_pth_dirs() -> Generator[Path, None, None]:
+def possible_pth_dirs() -> Iterator[Path]:
     """Produce a sequence of directories for trying to write .pth files."""
     # First look through sys.path, and if we find a .pth file, then it's a good
     # place to put ours.
diff --git a/tests/coveragetest.py b/tests/coveragetest.py
index 9b3e3342..100b8e3b 100644
--- a/tests/coveragetest.py
+++ b/tests/coveragetest.py
@@ -19,7 +19,7 @@ import sys
 
 from types import ModuleType
 from typing import (
-    Any, Collection, Dict, Generator, Iterable, List, Mapping, Optional,
+    Any, Collection, Dict, Iterable, Iterator, List, Mapping, Optional,
     Sequence, Tuple, Union,
 )
 
@@ -272,7 +272,7 @@ class CoverageTest(
         cov: Coverage,
         warnings: Iterable[str],
         not_warnings: Iterable[str]=(),
-    ) -> Generator[None, None, None]:
+    ) -> Iterator[None]:
         """A context manager to check that particular warnings happened in `cov`.
 
         `cov` is a Coverage instance.  `warnings` is a list of regexes.  Every
diff --git a/tests/helpers.py b/tests/helpers.py
index 6f427fc3..0f958a39 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -16,8 +16,8 @@ import textwrap
 import warnings
 
 from typing import (
-    cast,
-    Any, Callable, Generator, Iterable, List, Optional, Set, Tuple, Type, TypeVar, Union,
+    Any, Callable, Iterable, Iterator, List, Optional, Set, Tuple, Type,
+    TypeVar, Union, cast,
 )
 
 import pytest
@@ -267,7 +267,7 @@ def arcs_to_arcz_repr(arcs: Optional[Iterable[TArc]]) -> str:
 
 
 @contextlib.contextmanager
-def change_dir(new_dir: str) -> Generator[None, None, None]:
+def change_dir(new_dir: str) -> Iterator[None]:
     """Change directory, and then change back.
 
     Use as a context manager, it will return to the original
@@ -322,7 +322,7 @@ def assert_coverage_warnings(
 def swallow_warnings(
     message: str=r".",
     category: Type[Warning]=CoverageWarning,
-) -> Generator[None, None, None]:
+) -> Iterator[None]:
     """Swallow particular warnings.
 
     It's OK if they happen, or if they don't happen. Just ignore them.
diff --git a/tests/test_execfile.py b/tests/test_execfile.py
index 0b6afa61..90885794 100644
--- a/tests/test_execfile.py
+++ b/tests/test_execfile.py
@@ -14,7 +14,7 @@ import py_compile
 import re
 import sys
 
-from typing import Any, Generator
+from typing import Any, Iterator
 
 import pytest
 
@@ -31,7 +31,7 @@ class RunFileTest(CoverageTest):
     """Test cases for `run_python_file`."""
 
     @pytest.fixture(autouse=True)
-    def clean_up(self) -> Generator[None, None, None]:
+    def clean_up(self) -> Iterator[None]:
         """These tests all run in-process. Clean up global changes."""
         yield
         sys.excepthook = sys.__excepthook__
diff --git a/tests/test_files.py b/tests/test_files.py
index e8a6eaca..fe6c36a2 100644
--- a/tests/test_files.py
+++ b/tests/test_files.py
@@ -10,7 +10,7 @@ import os
 import os.path
 import re
 
-from typing import Any, Generator, Iterable, List
+from typing import Any, Iterable, Iterator, List
 from unittest import mock
 
 import pytest
@@ -137,7 +137,7 @@ def globs_to_regex_params(
     partial: bool=False,
     matches: Iterable[str]=(),
     nomatches: Iterable[str]=(),
-) -> Generator[Any, None, None]:
+) -> Iterator[Any]:
     """Generate parameters for `test_globs_to_regex`.
 
     `patterns`, `case_insensitive`, and `partial` are arguments for
-- 
cgit v1.2.1