Skip to content

[flake8-use-pathlib] Don't handle bytes strings in PTH123 #17767

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.

Sign up for GitHub

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

Closed
LaBatata101 wants to merge 1 commit into from
Closed

[flake8-use-pathlib] Don't handle bytes strings in PTH123 #17767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/full_name.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,6 @@ def f() -> int:
return 1
open(f())

open(b"foo")
byte_str = b"bar"
open(byte_str)

def bytes_str_func() -> bytes:
return b"foo"
open(bytes_str_func())

# https://github.com/astral-sh/ruff/issues/17693
os.stat(1)
os.stat(x)
Expand Down
23 changes: 1 addition & 22 deletions crates/ruff_linter/src/rules/flake8_use_pathlib/rules/replaceable_by_pathlib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ pub(crate) fn replaceable_by_pathlib(checker: &Checker, call: &ExprCall) {
|| call
.arguments
.find_positional(0)
.is_some_and(|expr| is_file_descriptor_or_bytes_str(expr, checker.semantic()))
.is_some_and(|expr| is_file_descriptor(expr, checker.semantic()))
{
return;
}
Expand Down Expand Up @@ -174,10 +174,6 @@ pub(crate) fn replaceable_by_pathlib(checker: &Checker, call: &ExprCall) {
}
}

fn is_file_descriptor_or_bytes_str(expr: &Expr, semantic: &SemanticModel) -> bool {
is_file_descriptor(expr, semantic) || is_bytes_string(expr, semantic)
}

/// Returns `true` if the given expression looks like a file descriptor, i.e., if it is an integer.
fn is_file_descriptor(expr: &Expr, semantic: &SemanticModel) -> bool {
if matches!(
Expand All @@ -201,23 +197,6 @@ fn is_file_descriptor(expr: &Expr, semantic: &SemanticModel) -> bool {
typing::is_int(binding, semantic)
}

/// Returns `true` if the given expression is a bytes string.
fn is_bytes_string(expr: &Expr, semantic: &SemanticModel) -> bool {
if matches!(expr, Expr::BytesLiteral(_)) {
return true;
}

let Some(name) = get_name_expr(expr) else {
return false;
};

let Some(binding) = semantic.only_binding(name).map(|id| semantic.binding(id)) else {
return false;
};

typing::is_bytes(binding, semantic)
}

fn get_name_expr(expr: &Expr) -> Option<&ast::ExprName> {
match expr {
Expr::Name(name) => Some(name),
Expand Down
Loading