Add last remaining deprecated typing imports (#3529)

astral-sh · Mar 15, 2023 · 57796c5 · 57796c5
1 parent 2545869
commit 57796c5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP035.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP035.py
@@ -41,7 +41,7 @@
         Good,
     )
 
-from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet
+from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
 
 if True: from collections import (
     Mapping, Counter)

diff --git a/crates/ruff/src/rules/pyupgrade/rules/deprecated_import.rs b/crates/ruff/src/rules/pyupgrade/rules/deprecated_import.rs
@@ -212,11 +212,13 @@ const TYPING_TO_RENAME_PY39: &[(&str, &str)] = &[
         "AsyncContextManager",
         "contextlib.AbstractAsyncContextManager",
     ),
+    ("ContextManager", "contextlib.AbstractContextManager"),
     ("AbstractSet", "collections.abc.Set"),
     ("Tuple", "tuple"),
     ("List", "list"),
     ("FrozenSet", "frozenset"),
     ("Dict", "dict"),
+    ("Type", "type"),
     ("Set", "set"),
     ("Deque", "collections.deque"),
     ("DefaultDict", "collections.defaultdict"),

diff --git a/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP035.py.snap b/crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP035.py.snap
@@ -292,15 +292,15 @@ expression: diagnostics
     column: 0
   end_location:
     row: 44
-    column: 75
+    column: 91
   fix:
-    content: "from typing import Match, Pattern, List, OrderedDict, AbstractSet\nfrom collections.abc import Callable"
+    content: "from typing import Match, Pattern, List, OrderedDict, AbstractSet, ContextManager\nfrom collections.abc import Callable"
     location:
       row: 44
       column: 0
     end_location:
       row: 44
-      column: 75
+      column: 91
   parent: ~
 - kind:
     name: DeprecatedImport
@@ -312,15 +312,15 @@ expression: diagnostics
     column: 0
   end_location:
     row: 44
-    column: 75
+    column: 91
   fix:
-    content: "from typing import Callable, Match, Pattern, List, AbstractSet\nfrom collections import OrderedDict"
+    content: "from typing import Callable, Match, Pattern, List, AbstractSet, ContextManager\nfrom collections import OrderedDict"
     location:
       row: 44
       column: 0
     end_location:
       row: 44
-      column: 75
+      column: 91
   parent: ~
 - kind:
     name: DeprecatedImport
@@ -332,15 +332,15 @@ expression: diagnostics
     column: 0
   end_location:
     row: 44
-    column: 75
+    column: 91
   fix:
-    content: "from typing import Callable, List, OrderedDict, AbstractSet\nfrom re import Match, Pattern"
+    content: "from typing import Callable, List, OrderedDict, AbstractSet, ContextManager\nfrom re import Match, Pattern"
     location:
       row: 44
       column: 0
     end_location:
       row: 44
-      column: 75
+      column: 91
   parent: ~
 - kind:
     name: DeprecatedImport
@@ -352,7 +352,7 @@ expression: diagnostics
     column: 0
   end_location:
     row: 44
-    column: 75
+    column: 91
   fix: ~
   parent: ~
 - kind:
@@ -365,7 +365,20 @@ expression: diagnostics
     column: 0
   end_location:
     row: 44
-    column: 75
+    column: 91
+  fix: ~
+  parent: ~
+- kind:
+    name: DeprecatedImport
+    body: "`typing.ContextManager` is deprecated, use `contextlib.AbstractContextManager` instead"
+    suggestion: ~
+    fixable: false
+  location:
+    row: 44
+    column: 0
+  end_location:
+    row: 44
+    column: 91
   fix: ~
   parent: ~
 - kind: