Skip to content

Fix GenericAlias parameter chaining #3394

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
merged 4 commits into from
Nov 2, 2021
Merged

Fix GenericAlias parameter chaining #3394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e48ba3
fix `make_parameters` in `GenericAlias`
Snowapril Oct 27, 2021
77cd095
fix `subs_tvars` to working on nested `GenericAlias`
Snowapril Oct 27, 2021
73ccb56
remove decorators on success tests
Snowapril Oct 27, 2021
f6c2999
remove duplicated extra_test
Snowapril Oct 27, 2021
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
4 changes: 0 additions & 4 deletions Lib/test/test_genericalias.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ def test_exposed_type(self):
self.assertEqual(a.__args__, (int,))
self.assertEqual(a.__parameters__, ())

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_parameters(self):
from typing import List, Dict, Callable
D0 = dict[str, int]
Expand Down Expand Up @@ -214,8 +212,6 @@ def test_parameters(self):
self.assertEqual(L5.__args__, (Callable[[K, V], K],))
self.assertEqual(L5.__parameters__, (K, V))

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_parameter_chaining(self):
from typing import List, Dict, Union, Callable
self.assertEqual(list[T][int], list[int])
Expand Down
4 changes: 0 additions & 4 deletions extra_tests/snippets/test_typing.py
View file
Open in desktop

This file was deleted.

51 changes: 31 additions & 20 deletions vm/src/builtins/genericalias.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,20 +175,25 @@ fn is_typevar(obj: &PyObjectRef) -> bool {
}

fn make_parameters(args: &PyTupleRef, vm: &VirtualMachine) -> PyTupleRef {
let mut parameters: Vec<PyObjectRef> = vec![];
let mut parameters: Vec<PyObjectRef> = Vec::with_capacity(args.len());
for arg in args.as_slice() {
if is_typevar(arg) {
parameters.push(arg.clone());
} else if let Ok(tuple) = arg
if !parameters.iter().any(|param| param.is(arg)) {
parameters.push(arg.clone());
}
} else if let Ok(subparams) = arg
.clone()
.get_attr("__parameters__", vm)
.and_then(|obj| PyTupleRef::try_from_object(vm, obj))
{
for subparam in tuple.as_slice() {
parameters.push(subparam.clone());
for subparam in subparams.as_slice() {
if !parameters.iter().any(|param| param.is(subparam)) {
parameters.push(subparam.clone());
}
}
}
}
parameters.shrink_to_fit();

PyTuple::new_ref(parameters, &vm.ctx)
}
Expand All @@ -204,27 +209,33 @@ fn subs_tvars(
argitems: &[PyObjectRef],
vm: &VirtualMachine,
) -> PyResult {
obj.clone_class()
.get_attr("__parameters__")
obj.clone()
.get_attr("__parameters__", vm)
.ok()
.and_then(|sub_params| {
PyTupleRef::try_from_object(vm, sub_params)
.ok()
.map(|sub_params| {
let sub_args = sub_params
.as_slice()
.iter()
.map(|arg| {
if let Some(idx) = tuple_index(params, arg) {
argitems[idx].clone()
} else {
arg.clone()
}
})
.collect::<Vec<_>>();
let sub_args: PyObjectRef = PyTuple::new_ref(sub_args, &vm.ctx).into();
obj.get_item(sub_args, vm)
if sub_params.len() > 0 {
let sub_args = sub_params
.as_slice()
.iter()
.map(|arg| {
if let Some(idx) = tuple_index(params, arg) {
argitems[idx].clone()
} else {
arg.clone()
}
})
.collect::<Vec<_>>();
let sub_args: PyObjectRef = PyTuple::new_ref(sub_args, &vm.ctx).into();
Some(obj.get_item(sub_args, vm))
} else {
None
}
})
})
.flatten()
.unwrap_or(Ok(obj))
}

Expand Down