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.

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

Make all Element with Template pickable natively #144

Merged
merged 12 commits into from
Oct 16, 2023
Merged

Make all Element with Template pickable natively #144

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ef7d0fb
Make _parse_size robust to already parsed values
BastienGauthier Oct 4, 2023
39a9302
Add the _template_str to recover all the Elements
BastienGauthier Oct 12, 2023
eb81e13
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 12, 2023
f7806af
__setstate__ simplification
BastienGauthier Oct 12, 2023
30b1bf6
Merge branch 'fix/unpickling_children_loss' of https://github.com/Bas…
BastienGauthier Oct 12, 2023
2a22fe7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 12, 2023
7e9a5d5
More change cleaning, keep only the Element change
BastienGauthier Oct 13, 2023
4d692a5
Merge branch 'fix/unpickling_children_loss' of https://github.com/Bas…
BastienGauthier Oct 13, 2023
de3592b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 13, 2023
27a24e3
Clean verbosity & set attribute privates
BastienGauthier Oct 16, 2023
c72e335
Merge branch 'fix/unpickling_children_loss' of https://github.com/Bas…
BastienGauthier Oct 16, 2023
57a60fe
Remove one action in Element setstate
BastienGauthier Oct 16, 2023
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
9 changes: 9 additions & 0 deletions branca/element.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ def __init__(self, template=None, template_name=None):
self._env = ENV
self._children = OrderedDict()
self._parent = None
self._template_str = template
self._template_name = template_name

if template is not None:
self._template = Template(template)
Expand All @@ -71,11 +73,18 @@ def __getstate__(self):
"""
state: dict = self.__dict__.copy()
state["_env"] = None
state.pop("_template", None)
return state

def __setstate__(self, state: dict):
"""Re-add ._env attribute when unpickling"""
state["_env"] = ENV

if state["_template_str"] is not None:
state["_template"] = Template(state["_template_str"])
elif state["_template_name"] is not None:
state["_template"] = ENV.get_template(state["_template_name"])

self.__dict__.update(state)

def get_name(self):
Expand Down