Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable autofix for flake8-print rules #2651

Merged
merged 1 commit into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Disable autofix for flake8-print rules
  • Loading branch information
charliermarsh committed Feb 8, 2023
commit dd864f43aa8a781d5e0fd95f5b0cefc1692fe6a1
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1121,8 +1121,8 @@ For more, see [flake8-print](https://pypi.org/project/flake8-print/) on PyPI.

| Code | Name | Message | Fix |
| ---- | ---- | ------- | --- |
| T201 | print-found | `print` found | 🛠 |
| T203 | p-print-found | `pprint` found | 🛠 |
| T201 | print-found | `print` found | |
| T203 | p-print-found | `pprint` found | |

### flake8-pytest-style (PT)

Expand Down
49 changes: 6 additions & 43 deletions crates/ruff/src/rules/flake8_print/rules/print_call.rs
Original file line number Diff line number Diff line change
@@ -1,45 +1,36 @@
use log::error;
use rustpython_parser::ast::{Expr, Keyword};

use ruff_macros::{define_violation, derive_message_formats};
use rustpython_parser::ast::{Expr, Keyword, Stmt, StmtKind};

use crate::ast::helpers::is_const_none;
use crate::ast::types::Range;
use crate::autofix::helpers;
use crate::checkers::ast::Checker;
use crate::registry::Diagnostic;
use crate::violation::AlwaysAutofixableViolation;
use crate::violation::Violation;

define_violation!(
pub struct PrintFound;
);
impl AlwaysAutofixableViolation for PrintFound {
impl Violation for PrintFound {
#[derive_message_formats]
fn message(&self) -> String {
format!("`print` found")
}

fn autofix_title(&self) -> String {
"Remove `print`".to_string()
}
}

define_violation!(
pub struct PPrintFound;
);
impl AlwaysAutofixableViolation for PPrintFound {
impl Violation for PPrintFound {
#[derive_message_formats]
fn message(&self) -> String {
format!("`pprint` found")
}

fn autofix_title(&self) -> String {
"Remove `pprint`".to_string()
}
}

/// T201, T203
pub fn print_call(checker: &mut Checker, func: &Expr, keywords: &[Keyword]) {
let mut diagnostic = {
let diagnostic = {
let call_path = checker.resolve_call_path(func);
if call_path
.as_ref()
Expand Down Expand Up @@ -77,33 +68,5 @@ pub fn print_call(checker: &mut Checker, func: &Expr, keywords: &[Keyword]) {
return;
}

if checker.patch(diagnostic.kind.rule()) {
let defined_by = checker.current_stmt();
let defined_in = checker.current_stmt_parent();
if matches!(defined_by.node, StmtKind::Expr { .. }) {
let deleted: Vec<&Stmt> = checker
.deletions
.iter()
.map(std::convert::Into::into)
.collect();
match helpers::delete_stmt(
defined_by.into(),
defined_in.map(std::convert::Into::into),
&deleted,
checker.locator,
checker.indexer,
checker.stylist,
) {
Ok(fix) => {
if fix.content.is_empty() || fix.content == "pass" {
checker.deletions.insert(defined_by.clone());
}
diagnostic.amend(fix);
}
Err(e) => error!("Failed to remove print call: {e}"),
}
}
}

checker.diagnostics.push(diagnostic);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
source: src/rules/flake8_print/mod.rs
source: crates/ruff/src/rules/flake8_print/mod.rs
expression: diagnostics
---
- kind:
Expand All @@ -10,15 +10,7 @@ expression: diagnostics
end_location:
row: 4
column: 5
fix:
content:
- ""
location:
row: 4
column: 0
end_location:
row: 5
column: 0
fix: ~
parent: ~
- kind:
PrintFound: ~
Expand All @@ -28,15 +20,7 @@ expression: diagnostics
end_location:
row: 5
column: 5
fix:
content:
- ""
location:
row: 5
column: 0
end_location:
row: 6
column: 0
fix: ~
parent: ~
- kind:
PrintFound: ~
Expand All @@ -46,15 +30,7 @@ expression: diagnostics
end_location:
row: 6
column: 5
fix:
content:
- ""
location:
row: 6
column: 0
end_location:
row: 7
column: 0
fix: ~
parent: ~
- kind:
PrintFound: ~
Expand All @@ -64,14 +40,6 @@ expression: diagnostics
end_location:
row: 7
column: 5
fix:
content:
- ""
location:
row: 7
column: 0
end_location:
row: 8
column: 0
fix: ~
parent: ~

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
source: src/rules/flake8_print/mod.rs
source: crates/ruff/src/rules/flake8_print/mod.rs
expression: diagnostics
---
- kind:
Expand All @@ -10,15 +10,7 @@ expression: diagnostics
end_location:
row: 3
column: 6
fix:
content:
- ""
location:
row: 3
column: 0
end_location:
row: 4
column: 0
fix: ~
parent: ~
- kind:
PPrintFound: ~
Expand All @@ -28,14 +20,6 @@ expression: diagnostics
end_location:
row: 7
column: 13
fix:
content:
- ""
location:
row: 7
column: 0
end_location:
row: 8
column: 0
fix: ~
parent: ~