removed six

README.md

@@ -794,7 +794,6 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/) on PyPI.
 | UP013 | convert-typed-dict-functional-to-class | Convert `{name}` from `TypedDict` functional to class syntax | 🛠 |
 | UP014 | convert-named-tuple-functional-to-class | Convert `{name}` from `NamedTuple` functional to class syntax | 🛠 |
 | UP015 | redundant-open-modes | Unnecessary open mode parameters | 🛠 |
-| UP016 | remove-six-compat | Unnecessary `six` compatibility usage | 🛠 |
 | UP017 | datetime-timezone-utc | Use `datetime.UTC` alias | 🛠 |
 | UP018 | native-literals | Unnecessary call to `{literal_type}` | 🛠 |
 | UP019 | typing-text-str-alias | `typing.Text` is deprecated, use `str` | 🛠 |
@@ -814,7 +813,6 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/) on PyPI.
 | UP033 | functools-cache | Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` | 🛠 |
 | UP034 | extraneous-parentheses | Avoid extraneous parentheses | 🛠 |
 | UP035 | import-replacements | Replace old formatting imports with their new versions | 🛠 |
-| UP036 | import-replacements-six | Replace old formatting imports with their new versions | 🛠 |
 
 ### flake8-2020 (YTT)
 

resources/test/fixtures/pyupgrade/UP035.py

@@ -17,8 +17,6 @@
 
 from collections import Counter, Mapping, Sequence
 
-from six.moves import getcwd, StringIO
-
 from collections import Mapping as mapping, Counter
 
 if True:

ruff.schema.json

@@ -1870,7 +1870,6 @@
         "UP013",
         "UP014",
         "UP015",
-        "UP016",
         "UP017",
         "UP018",
         "UP019",
@@ -1892,7 +1891,6 @@
         "UP033",
         "UP034",
         "UP035",
-        "UP036",
         "W",
         "W2",
         "W29",

src/rules/pyupgrade/rules/import_replacements.rs

@@ -27,9 +27,6 @@ impl AlwaysAutofixableViolation for ImportReplacements {
 const BAD_MODULES: &[&str] = &[
     "collections",
     "pipes",
-    "six",
-    "six.moves",
-    "six.moves.urllib",
     "mypy_extensions",
     "typing_extensions",
     "typing",
@@ -66,24 +63,6 @@ const COLLECTIONS_TO_ABC: &[&str] = &[
 
 const PIPES_TO_SHLEX: &[&str] = &["quote"];
 
-const SIX_TO_IO: &[&str] = &["BytesIO", "StringIO"];
-
-const SIX_TO_FUNCTOOLS: &[&str] = &["wraps"];
-
-const SIXMOVES_TO_IO: &[&str] = &["StringIO"];
-
-const SIXMOVES_TO_COLLECTIONS: &[&str] = &["UserDict", "UserList", "UserString"];
-
-const SIXMOVES_TO_ITERTOOLS: &[&str] = &["filterfalse", "zip_longest"];
-
-const SIXMOVES_TO_OS: &[&str] = &["getcwd", "getcwdb"];
-
-const SIXMOVES_TO_SUBPROCESS: &[&str] = &["getouput"];
-
-const SIXMOVES_TO_SYS: &[&str] = &["intern"];
-
-const SIXMOVES_TO_URLLIB: &[&str] = &["parse", "request", "response", "error", "robotparser"];
-
 const TYPINGEXTENSIONS_TO_TYPING: &[&str] = &[
     "AsyncIterable",
     "AsyncIterator",
@@ -243,34 +222,6 @@ impl<'a> FixImports<'a> {
         match self.module {
             "collections" => self.create_new_str(COLLECTIONS_TO_ABC, "collections.abc"),
             "pipes" => self.create_new_str(PIPES_TO_SHLEX, "shlex"),
-            "six" => {
-                if has_match(SIX_TO_IO, self.names) {
-                    self.create_new_str(SIX_TO_IO, "io")
-                } else if has_match(SIX_TO_FUNCTOOLS, self.names) {
-                    self.create_new_str(SIX_TO_FUNCTOOLS, "functools")
-                } else {
-                    None
-                }
-            }
-            "six.moves" => {
-                if has_match(SIXMOVES_TO_IO, self.names) {
-                    self.create_new_str(SIXMOVES_TO_IO, "io")
-                } else if has_match(SIXMOVES_TO_COLLECTIONS, self.names) {
-                    self.create_new_str(SIXMOVES_TO_COLLECTIONS, "collections")
-                } else if has_match(SIXMOVES_TO_ITERTOOLS, self.names) {
-                    self.create_new_str(SIXMOVES_TO_ITERTOOLS, "itertools")
-                } else if has_match(SIXMOVES_TO_OS, self.names) {
-                    self.create_new_str(SIXMOVES_TO_OS, "os")
-                } else if has_match(SIXMOVES_TO_SUBPROCESS, self.names) {
-                    self.create_new_str(SIXMOVES_TO_SUBPROCESS, "subprocess")
-                } else if has_match(SIXMOVES_TO_SYS, self.names) {
-                    self.create_new_str(SIXMOVES_TO_SYS, "sys")
-                } else if has_match(SIXMOVES_TO_URLLIB, self.names) {
-                    self.create_new_str(SIXMOVES_TO_URLLIB, "urllib")
-                } else {
-                    None
-                }
-            }
             "typing_extensions" => {
                 if has_match(TYPINGEXTENSIONS_TO_TYPING, self.names) {
                     self.create_new_str(TYPINGEXTENSIONS_TO_TYPING, "typing")

src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP035_UP035.py.snap

@@ -166,119 +166,100 @@ expression: diagnostics
     column: 0
   end_location:
     row: 20
-    column: 38
-  fix:
-    content:
-      - from six.moves import getcwd
-      - from io import StringIO
-    location:
-      row: 20
-      column: 0
-    end_location:
-      row: 20
-      column: 38
-  parent: ~
-- kind:
-    ImportReplacements: ~
-  location:
-    row: 22
-    column: 0
-  end_location:
-    row: 22
     column: 51
   fix:
     content:
       - from collections import Counter
       - from collections.abc import Mapping as mapping
     location:
-      row: 22
+      row: 20
       column: 0
     end_location:
-      row: 22
+      row: 20
       column: 51
   parent: ~
 - kind:
     ImportReplacements: ~
   location:
-    row: 25
+    row: 23
     column: 4
   end_location:
-    row: 25
+    row: 23
     column: 44
   fix:
     content:
       - from collections import Counter
       - "    from collections.abc import Mapping"
     location:
-      row: 25
+      row: 23
       column: 4
     end_location:
-      row: 25
+      row: 23
       column: 44
   parent: ~
 - kind:
     ImportReplacements: ~
   location:
-    row: 30
+    row: 28
     column: 4
   end_location:
-    row: 30
+    row: 28
     column: 44
   fix:
     content:
       - from collections import Counter
       - "    from collections.abc import Mapping"
     location:
-      row: 30
+      row: 28
       column: 4
     end_location:
-      row: 30
+      row: 28
       column: 44
   parent: ~
 - kind:
     ImportReplacements: ~
   location:
-    row: 32
+    row: 30
     column: 9
   end_location:
-    row: 32
+    row: 30
     column: 40
   fix:
     content:
       - from collections.abc import Mapping
     location:
-      row: 32
+      row: 30
       column: 9
     end_location:
-      row: 32
+      row: 30
       column: 40
   parent: ~
 - kind:
     ImportReplacements: ~
   location:
-    row: 35
+    row: 33
     column: 0
   end_location:
-    row: 35
+    row: 33
     column: 40
   fix:
     content:
       - from collections import Counter
       - from collections.abc import Mapping
     location:
-      row: 35
+      row: 33
       column: 0
     end_location:
-      row: 35
+      row: 33
       column: 40
   parent: ~
 - kind:
     ImportReplacements: ~
   location:
-    row: 39
+    row: 37
     column: 4
   end_location:
-    row: 44
+    row: 42
     column: 5
   fix:
     content:
@@ -291,10 +272,10 @@ expression: diagnostics
       - "        Callable"
       - "     )"
     location:
-      row: 39
+      row: 37
       column: 4
     end_location:
-      row: 44
+      row: 42
       column: 5
   parent: ~