Remove remove-six-compat (UP016) (#2332)

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` | 🛠 |

ruff.schema.json

@@ -1870,7 +1870,6 @@
         "UP013",
         "UP014",
         "UP015",
-        "UP016",
         "UP017",
         "UP018",
         "UP019",

src/checkers/ast.rs

@@ -2089,11 +2089,6 @@ where
                 {
                     pyupgrade::rules::use_pep585_annotation(self, expr);
                 }
-
-                if self.settings.rules.enabled(&Rule::RemoveSixCompat) {
-                    pyupgrade::rules::remove_six_compat(self, expr);
-                }
-
                 if self.settings.rules.enabled(&Rule::DatetimeTimezoneUTC)
                     && self.settings.target_version >= PythonVersion::Py311
                 {
@@ -2105,16 +2100,13 @@ where
                 if self.settings.rules.enabled(&Rule::RewriteMockImport) {
                     pyupgrade::rules::rewrite_mock_attribute(self, expr);
                 }
-
                 if self.settings.rules.enabled(&Rule::SixPY3Referenced) {
                     flake8_2020::rules::name_or_attribute(self, expr);
                 }
-
-                pandas_vet::rules::check_attr(self, attr, value, expr);
-
                 if self.settings.rules.enabled(&Rule::BannedApi) {
                     flake8_tidy_imports::banned_api::banned_attribute_access(self, expr);
                 }
+                pandas_vet::rules::check_attr(self, attr, value, expr);
             }
             ExprKind::Call {
                 func,
@@ -2227,9 +2219,6 @@ where
                 if self.settings.rules.enabled(&Rule::RedundantOpenModes) {
                     pyupgrade::rules::redundant_open_modes(self, expr);
                 }
-                if self.settings.rules.enabled(&Rule::RemoveSixCompat) {
-                    pyupgrade::rules::remove_six_compat(self, expr);
-                }
                 if self.settings.rules.enabled(&Rule::NativeLiterals) {
                     pyupgrade::rules::native_literals(self, expr, func, args, keywords);
                 }

src/registry.rs

@@ -237,7 +237,6 @@ ruff_macros::define_rule_mapping!(
     UP013 => violations::ConvertTypedDictFunctionalToClass,
     UP014 => violations::ConvertNamedTupleFunctionalToClass,
     UP015 => violations::RedundantOpenModes,
-    UP016 => violations::RemoveSixCompat,
     UP017 => violations::DatetimeTimezoneUTC,
     UP018 => violations::NativeLiterals,
     UP019 => violations::TypingTextStrAlias,

src/rules/pyupgrade/mod.rs

@@ -35,7 +35,6 @@ mod tests {
     #[test_case(Rule::ConvertTypedDictFunctionalToClass, Path::new("UP013.py"); "UP013")]
     #[test_case(Rule::ConvertNamedTupleFunctionalToClass, Path::new("UP014.py"); "UP014")]
     #[test_case(Rule::RedundantOpenModes, Path::new("UP015.py"); "UP015")]
-    #[test_case(Rule::RemoveSixCompat, Path::new("UP016.py"); "UP016")]
     #[test_case(Rule::NativeLiterals, Path::new("UP018.py"); "UP018")]
     #[test_case(Rule::TypingTextStrAlias, Path::new("UP019.py"); "UP019")]
     #[test_case(Rule::ReplaceUniversalNewlines, Path::new("UP021.py"); "UP021")]

src/rules/pyupgrade/rules/mod.rs

@@ -14,7 +14,6 @@ pub(crate) use os_error_alias::os_error_alias;
 pub(crate) use printf_string_formatting::printf_string_formatting;
 pub(crate) use redundant_open_modes::redundant_open_modes;
 use regex::Regex;
-pub(crate) use remove_six_compat::remove_six_compat;
 pub(crate) use replace_stdout_stderr::replace_stdout_stderr;
 pub(crate) use replace_universal_newlines::replace_universal_newlines;
 pub(crate) use rewrite_c_element_tree::replace_c_element_tree;
@@ -55,7 +54,6 @@ mod open_alias;
 mod os_error_alias;
 mod printf_string_formatting;
 mod redundant_open_modes;
-mod remove_six_compat;
 mod replace_stdout_stderr;
 mod replace_universal_newlines;
 mod rewrite_c_element_tree;