Skip to content

Fail in last PR regarding the use of json module #225

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
MarcelGeo merged 4 commits into from
Jan 16, 2025
Merged

Fail in last PR regarding the use of json module #225

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd2d56c
Fix using json module load from onject instead of string
ValentinBuira Dec 6, 2024
f5daeea
Merge branch 'master' into fix-typo-parsing
ValentinBuira Jan 10, 2025
0c71e53
Add tests to workspace_* functions
ValentinBuira Jan 14, 2025
1c0ec53
style
ValentinBuira Jan 14, 2025
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
2 changes: 1 addition & 1 deletion mergin/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ def workspace_service(self, workspace_id):
Returns response from server as JSON dict or None if endpoint is not found
"""
resp = self.get(f"/v1/workspace/{workspace_id}/service")
return json.loads(resp)
return json.load(resp)

def workspace_usage(self, workspace_id):
"""
Expand Down
Loading