Skip to content

config: exclude multiple inheritance from JSON loading typing #4178

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

Merged
behrmann merged 1 commit into from
Feb 18, 2026
+4 −4
Merged

config: exclude multiple inheritance from JSON loading typing #4178

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
8 changes: 4 additions & 4 deletions mkosi/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1906,9 +1906,9 @@ def from_json(cls, s: Union[str, dict[str, Any], SupportsRead[str], SupportsRead
j: dict[str, Any]
if isinstance(s, str):
j = json.loads(s)
elif isinstance(s, dict):
elif isinstance(s, dict) and not hasattr(s, "read"):
j = s
elif hasattr(s, "read"):
elif hasattr(s, "read") and not isinstance(s, dict):
j = json.load(s)
else:
raise ValueError(
Expand Down Expand Up @@ -2482,9 +2482,9 @@ def from_partial_json(
j: dict[str, Any]
if isinstance(s, str):
j = json.loads(s)
elif isinstance(s, dict):
elif isinstance(s, dict) and not hasattr(s, "read"):
j = s
elif hasattr(s, "read"):
elif hasattr(s, "read") and not isinstance(s, dict):
j = json.load(s)
else:
raise ValueError(
Expand Down
Loading