Fix UP024 alias fix

astral-sh · Mar 11, 2023 · 07218cb · 07218cb
1 parent d298804
commit 07218cb
Show file tree

Hide file tree

Showing 7 changed files with 164 additions and 193 deletions.
diff --git a/crates/ruff/resources/test/fixtures/pyupgrade/UP024_4.py b/crates/ruff/resources/test/fixtures/pyupgrade/UP024_4.py
@@ -0,0 +1,10 @@
+import socket
+
+from kombu import Connection, exceptions
+
+try:
+    conn = Connection(settings.CELERY_BROKER_URL)
+    conn.ensure_connection(max_retries=2)
+    conn._close()
+except (socket.error, exceptions.OperationalError):
+    return HttpResponseServerError("cache: cannot connect to broker.")
diff --git a/crates/ruff/src/checkers/ast/mod.rs b/crates/ruff/src/checkers/ast/mod.rs
@@ -1505,7 +1505,7 @@ where
                 }
                 if self.settings.rules.enabled(&Rule::OSErrorAlias) {
                     if let Some(item) = exc {
-                        pyupgrade::rules::os_error_alias(self, &item);
+                        pyupgrade::rules::os_error_alias_raise(self, item);
                     }
                 }
                 if self.settings.rules.enabled(&Rule::RaiseVanillaClass) {
@@ -1757,7 +1757,7 @@ where
                     flake8_bugbear::rules::redundant_tuple_in_exception_handler(self, handlers);
                 }
                 if self.settings.rules.enabled(&Rule::OSErrorAlias) {
-                    pyupgrade::rules::os_error_alias(self, &handlers);
+                    pyupgrade::rules::os_error_alias_handlers(self, handlers);
                 }
                 if self.settings.rules.enabled(&Rule::AssertInExcept) {
                     self.diagnostics.extend(
@@ -2484,7 +2484,7 @@ where
                     pyupgrade::rules::replace_stdout_stderr(self, expr, func, keywords);
                 }
                 if self.settings.rules.enabled(&Rule::OSErrorAlias) {
-                    pyupgrade::rules::os_error_alias(self, &expr);
+                    pyupgrade::rules::os_error_alias_call(self, func);
                 }
                 if self.settings.rules.enabled(&Rule::IsinstanceWithTuple)
                     && self.settings.target_version >= PythonVersion::Py310

diff --git a/crates/ruff/src/rules/pyupgrade/mod.rs b/crates/ruff/src/rules/pyupgrade/mod.rs
@@ -45,6 +45,7 @@ mod tests {
     #[test_case(Rule::OSErrorAlias, Path::new("UP024_1.py"); "UP024_1")]
     #[test_case(Rule::OSErrorAlias, Path::new("UP024_2.py"); "UP024_2")]
     #[test_case(Rule::OSErrorAlias, Path::new("UP024_3.py"); "UP024_3")]
+    #[test_case(Rule::OSErrorAlias, Path::new("UP024_4.py"); "UP024_4")]
     #[test_case(Rule::RewriteUnicodeLiteral, Path::new("UP025.py"); "UP025")]
     #[test_case(Rule::RewriteMockImport, Path::new("UP026.py"); "UP026")]
     #[test_case(Rule::RewriteListComprehension, Path::new("UP027.py"); "UP027")]

diff --git a/crates/ruff/src/rules/pyupgrade/rules/mod.rs b/crates/ruff/src/rules/pyupgrade/rules/mod.rs
@@ -16,7 +16,9 @@ pub(crate) use lru_cache_without_parameters::{
 };
 pub(crate) use native_literals::{native_literals, NativeLiterals};
 pub(crate) use open_alias::{open_alias, OpenAlias};
-pub(crate) use os_error_alias::{os_error_alias, OSErrorAlias};
+pub(crate) use os_error_alias::{
+    os_error_alias_call, os_error_alias_handlers, os_error_alias_raise, OSErrorAlias,
+};
 pub(crate) use outdated_version_block::{outdated_version_block, OutdatedVersionBlock};
 pub(crate) use printf_string_formatting::{printf_string_formatting, PrintfStringFormatting};
 pub(crate) use quoted_annotation::{quoted_annotation, QuotedAnnotation};