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

get_object_state, use args only when available #217

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

get_object_state, use args only when available #217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aad7ccd
get_object_state, use args only when available
albertz Nov 5, 2024
2e9f749
small compat fix
albertz Nov 5, 2024
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
14 changes: 4 additions & 10 deletions sisyphus/hash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,9 @@ def get_object_state(obj):
return str(obj)

if hasattr(obj, "__getnewargs_ex__"):
args = obj.__getnewargs_ex__()
return obj.__getnewargs_ex__(), None
elif hasattr(obj, "__getnewargs__"):
args = obj.__getnewargs__()
else:
args = None
return obj.__getnewargs__(), None

if hasattr(obj, "__sis_state__"):
state = obj.__sis_state__()
Expand All @@ -102,18 +100,14 @@ def get_object_state(obj):
state = _getmembers(obj)
if not state and not hasattr(obj, "__dict__") and not hasattr(obj, "__slots__"):
# Keep compatibility with old behavior.
assert args is not None, "Failed to get object state of: %s" % repr(obj)
state = None
raise ValueError("Failed to get object state of: %s" % repr(obj))

if isinstance(obj, enum.Enum):
assert isinstance(state, dict)
# In Python >=3.11, keep hash same as in Python <=3.10, https://github.com/rwth-i6/sisyphus/issues/188
state.pop("_sort_order_", None)

if args is None:
return state
else:
return args, state
return state


def sis_hash_helper(obj):
Expand Down
Loading