Skip to content

Match hashlib constructor name type diagnostics #9066

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

Merged
youknowone merged 1 commit into from
Oct 11, 2026
Merged

Match hashlib constructor name type diagnostics #9066

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
30 changes: 27 additions & 3 deletions crates/stdlib/src/hashlib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub(crate) use _hashlib::module_def;
#[pymodule]
pub(crate) mod _hashlib {
use crate::vm::{
Py, PyObject, PyObjectRef, PyPayload, PyResult, VirtualMachine,
Py, PyObject, PyObjectRef, PyPayload, PyResult, TryFromObject, VirtualMachine,
builtins::{
PyBaseExceptionRef, PyBytes, PyFrozenSet, PyStr, PyType, PyTypeRef, PyUtf8StrRef,
PyValueError,
Expand Down Expand Up @@ -67,11 +67,35 @@ pub(crate) mod _hashlib {
dict.into()
}

#[derive(Debug)]

@chatgpt-codex-connector chatgpt-codex-connector Bot Oct 10, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Add the required AI-assistance trailer

This commit is authored by Codex <codex@openai.com>, but the reviewed commit message has no Assisted-by: trailer. Repository policy requires that exact trailer form for every AI-assisted contribution, so add it before this commit is merged.

AGENTS.md reference: AGENTS.md:L23-L23

Useful? React with 👍 / 👎.

struct HashName(PyUtf8StrRef);

impl TryFromObject for HashName {
fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
if !obj.downcastable::<PyStr>() {
let name = if vm.is_none(&obj) {
"None".into()
} else {
obj.class().slot_name()
};
let mut end = name.len().min(50);
while !name.is_char_boundary(end) {
end -= 1;
}
return Err(vm.new_type_error(format!(
"new() argument 'name' must be str, not {}",
&name[..end]
)));
}
PyUtf8StrRef::try_from_object(vm, obj).map(Self)
}
}

#[derive(FromArgs, Debug)]
#[allow(unused)]
struct NewHashArgs {
#[pyarg(any)]
name: PyUtf8StrRef,
name: HashName,
// Missing still allows the string keyword; b'' does not.
#[pyarg(any, optional, py_default = "b''")]
data: OptionalArg<ArgBytesLike>,
Expand Down Expand Up @@ -785,7 +809,7 @@ pub(crate) mod _hashlib {
#[pyfunction(name = "new")]
fn hashlib_new(args: NewHashArgs, vm: &VirtualMachine) -> PyResult<PyObjectRef> {
let data = resolve_data(args.data, args.string, vm)?;
match args.name.as_str().to_lowercase().as_str() {
match args.name.0.as_str().to_lowercase().as_str() {
"md5" => Ok(new_fixed_hasher("md5", data).into_pyobject(vm)),
"sha1" => Ok(new_fixed_hasher("sha1", data).into_pyobject(vm)),
"sha224" => Ok(new_fixed_hasher("sha224", data).into_pyobject(vm)),
Expand Down
16 changes: 16 additions & 0 deletions extra_tests/snippets/stdlib_hashlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import _hashlib
import _md5
import _sha1
import array
import hashlib

from testutils import assert_raises
Expand Down Expand Up @@ -64,3 +66,17 @@
# narrower than the length asked for, converting the argument fails first.
with assert_raises(OverflowError):
hashlib.pbkdf2_hmac("sha256", b"password", b"salt", 1, 2**62)


# Invalid names use the native constructor's bounded type diagnostic.
for value, name in (
(None, "None"),
(42, "int"),
(b"sha256", "bytes"),
(array.array("b"), "array.array"),
(type("x" * 60, (), {})(), "x" * 50),
(type("€" * 17, (), {})(), "€" * 16),
):
with assert_raises(TypeError) as caught:
_hashlib.new(value)
assert str(caught.exception) == f"new() argument 'name' must be str, not {name}"

@chatgpt-codex-connector chatgpt-codex-connector Bot Oct 10, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Remove the prohibited test assertion

This appended loop introduces new test data, test logic, and an assertion in an existing test file. Repository policy explicitly forbids modifying test assertions, logic, or data, so remove this test hunk before merging.

AGENTS.md reference: AGENTS.md:L275-L275

Useful? React with 👍 / 👎.

Loading