Merge pull request #10213 from domdfcoding/tenacity-noreturn

Patch tenacity to quote typing.NoReturn
pypa · Jul 26, 2021 · a53f888 · a53f888
2 parents 867bbb0 + 20629e4
commit a53f888
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/pip/_vendor/tenacity/__init__.py b/src/pip/_vendor/tenacity/__init__.py
@@ -190,7 +190,7 @@ def __init__(self, last_attempt: "Future") -> None:
         self.last_attempt = last_attempt
         super().__init__(last_attempt)
 
-    def reraise(self) -> t.NoReturn:
+    def reraise(self) -> "t.NoReturn":
         if self.last_attempt.failed:
             raise self.last_attempt.result()
         raise self

diff --git a/tools/vendoring/patches/tenacity.patch b/tools/vendoring/patches/tenacity.patch
@@ -1,5 +1,5 @@
 diff --git a/src/pip/_vendor/tenacity/__init__.py b/src/pip/_vendor/tenacity/__init__.py
-index 88c28d2d6..f984eec4e 100644
+index 88c28d2d6..086ad46e1 100644
 --- a/src/pip/_vendor/tenacity/__init__.py
 +++ b/src/pip/_vendor/tenacity/__init__.py
 @@ -76,10 +76,12 @@ from .after import after_nothing  # noqa
@@ -19,3 +19,16 @@ index 88c28d2d6..f984eec4e 100644
 
  if t.TYPE_CHECKING:
      import types
+
+--- a/src/pip/_vendor/tenacity/__init__.py
++++ b/src/pip/_vendor/tenacity/__init__.py
+@@ -190,7 +190,7 @@ class RetryError(Exception):
+         self.last_attempt = last_attempt
+         super().__init__(last_attempt)
+
+-    def reraise(self) -> t.NoReturn:
++    def reraise(self) -> "t.NoReturn":
+         if self.last_attempt.failed:
+             raise self.last_attempt.result()
+         raise self
+