Skip to content

Implement class_getitem for failing types #4169

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
jopemachine wants to merge 2 commits into from
Closed

Implement class_getitem for failing types #4169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
330ceb1
Add `__class_getitem__` to `partial`
jopemachine Sep 18, 2022
af10bdd
Remove `expectedFailure` tags
jopemachine Sep 18, 2022
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 @@ -85,8 +85,6 @@ class BaseTest(unittest.TestCase):
if ctypes is not None:
generic_types.extend((ctypes.Array, ctypes.LibraryLoader))

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_subscriptable(self):
for t in self.generic_types:
if t is None:
Expand Down Expand Up @@ -314,8 +312,6 @@ def test_dir(self):
for generic_alias_property in ("__origin__", "__args__", "__parameters__"):
self.assertIn(generic_alias_property, dir_of_gen_alias)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_weakref(self):
for t in self.generic_types:
if t is None:
Expand Down
11 changes: 9 additions & 2 deletions stdlib/src/contextvars.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ thread_local! {

#[pymodule]
mod _contextvars {
use rustpython_vm::builtins::PyGenericAlias;

use crate::vm::{
AsObject, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, atomic_func,
builtins::{PyStrRef, PyTypeRef},
Expand Down Expand Up @@ -471,8 +473,8 @@ mod _contextvars {
}

#[pyclassmethod(magic)]
fn class_getitem(_cls: PyTypeRef, _key: PyStrRef, _vm: &VirtualMachine) -> PyResult<()> {
unimplemented!("ContextVar.__class_getitem__() is currently under construction")
fn class_getitem(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {
PyGenericAlias::new(cls, args, vm)
}
}

Expand Down Expand Up @@ -561,6 +563,11 @@ mod _contextvars {
None => ContextTokenMissing::static_type().to_owned().into(),
}
}

#[pyclassmethod(magic)]
fn class_getitem(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {
PyGenericAlias::new(cls, args, vm)
}
}

impl Constructor for ContextToken {
Expand Down
Loading