Skip to content

Preserve options when reconstructing dynamic TypeVars #612

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

Open
muneikh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve options when reconstructing dynamic TypeVars #612

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
10 changes: 9 additions & 1 deletion cloudpickle/cloudpickle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,25 +595,33 @@ class id will also reuse this enum definition.
return _lookup_class_or_track(class_tracker_id, enum_class)


def _make_typevar(name, bound, constraints, covariant, contravariant, class_tracker_id):
def _make_typevar(
name, bound, constraints, covariant, contravariant, class_tracker_id, extra=None
):
tv = typing.TypeVar(
name,
*constraints,
bound=bound,
covariant=covariant,
contravariant=contravariant,
**(extra or {}),
)
return _lookup_class_or_track(class_tracker_id, tv)


def _decompose_typevar(obj):
extra = {}
for attr in ("infer_variance", "default"):
if hasattr(obj, f"__{attr}__"):
extra[attr] = getattr(obj, f"__{attr}__")
return (
obj.__name__,
obj.__bound__,
obj.__constraints__,
obj.__covariant__,
obj.__contravariant__,
_get_or_create_tracker_id(obj),
extra,
)


Expand Down
12 changes: 12 additions & 0 deletions tests/cloudpickle_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2576,6 +2576,18 @@ def test_pickle_dynamic_typevar_tracking(self):
T2 = subprocess_pickle_echo(T, protocol=self.protocol)
assert T is T2

@pytest.mark.skipif(sys.version_info < (3, 12), reason="Needs PEP 695")
def test_pickle_dynamic_typevar_infer_variance(self):
T = typing.TypeVar("T", infer_variance=True)
with subprocess_worker(protocol=self.protocol) as worker:
assert worker.run(lambda t: t.__infer_variance__, T) is True

@pytest.mark.skipif(sys.version_info < (3, 13), reason="Needs PEP 696")
def test_pickle_dynamic_typevar_default(self):
T = typing.TypeVar("T", default=int)
with subprocess_worker(protocol=self.protocol) as worker:
assert worker.run(lambda t: t.__default__, T) is int

def test_pickle_dynamic_typevar_memoization(self):
T = typing.TypeVar("T")
depickled_T1, depickled_T2 = pickle_depickle((T, T), protocol=self.protocol)
Expand Down