Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,16 @@ def opener(path, flags):
open(x)
def foo(y: int):
open(y)

# https://github.com/astral-sh/ruff/issues/17691
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())
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,9 @@ pub(crate) fn replaceable_by_pathlib(checker: &Checker, call: &ExprCall) {
.arguments
.find_argument_value("opener", 7)
.is_some_and(|expr| !expr.is_none_literal_expr())
|| call
.arguments
.find_positional(0)
.is_some_and(|expr| is_file_descriptor(expr, checker.semantic()))
|| call.arguments.find_positional(0).is_some_and(|expr| {
is_file_descriptor_or_bytes_str(expr, checker.semantic())
})
{
return None;
}
Expand Down Expand Up @@ -168,6 +167,10 @@ 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 @@ -180,7 +183,7 @@ fn is_file_descriptor(expr: &Expr, semantic: &SemanticModel) -> bool {
return true;
}

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

Expand All @@ -190,3 +193,28 @@ 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),
Expr::Call(ast::ExprCall { func, .. }) => get_name_expr(func),
_ => None,
}
}
12 changes: 12 additions & 0 deletions crates/ruff_python_semantic/src/analyze/typing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,18 @@ pub fn check_type<T: TypeChecker>(binding: &Binding, semantic: &SemanticModel) -
_ => false,
},

BindingKind::FunctionDefinition(_) => match binding.statement(semantic) {
// ```python
// def foo() -> int:
// ...
// ```
Some(Stmt::FunctionDef(ast::StmtFunctionDef { returns, .. })) => returns
.as_ref()
.is_some_and(|return_ann| T::match_annotation(return_ann, semantic)),

_ => false,
},

_ => false,
}
}
Expand Down
Loading