Skip to content
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.

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

Prefer forward conversion if registered #95

Merged
merged 5 commits into from
Jan 24, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ Pipfile
test/core.*
.eggs/
.idea/
.vs/
11 changes: 8 additions & 3 deletions src/frozendict/cool.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,15 @@ def deepfreeze(
custom_inverse_converters = custom_inverse_converters
)

if frozen_type:
return type_o(o)
try:
freeze = freeze_conversion_map[base_type_o]
except KeyError:
if frozen_type:
freeze = type_o
else:
raise

return freeze_conversion_map[base_type_o](o)
return freeze(o)


__all__ = (
Expand Down
44 changes: 44 additions & 0 deletions test/test_freeze.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import frozendict as cool
from frozendict import frozendict
from collections import OrderedDict
from collections.abc import MutableSequence, Sequence
from array import array
from types import MappingProxyType
from frozendict import FreezeError, FreezeWarning
Expand All @@ -12,6 +13,38 @@ def __init__(self, x):
self.x = x


class BaseSeq(Sequence):

def __init__(self, seq):
self._items = list(seq)

def __getitem__(self, i):
return self._items[i]

def __len__(self):
return len(self._items)


class FrozenSeqA(BaseSeq):
pass


class FrozenSeqB(BaseSeq):
pass


class MutableSeq(BaseSeq, MutableSequence):

def __delitem__(self, i):
del self._items[i]

def __setitem__(self, i, v):
self._items[i] = v

def insert(self, index, value):
self._items.insert(index, value)


def custom_a_converter(a):
return frozendict(**a.__dict__, y="mbuti")

Expand Down Expand Up @@ -138,3 +171,14 @@ def test_register_inverse(before_cure_inverse, after_cure_inverse):
)

assert cool.deepfreeze(before_cure_inverse) == after_cure_inverse


def test_prefer_forward():
assert isinstance(
cool.deepfreeze(
[FrozenSeqA((0, 1, 2))],
custom_converters={FrozenSeqA: FrozenSeqB},
custom_inverse_converters={FrozenSeqA: MutableSeq}
)[0],
FrozenSeqB
)
Loading