Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix TypeError during JSON serialization in dialogs #760

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
pirat89 merged 2 commits into from
Feb 28, 2022
Merged

Fix TypeError during JSON serialization in dialogs #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b372991
Fix TypeError during JSON serialization in dialogs
fernflower Feb 25, 2022
2967f07
packaging: Bump the leapp-framework to 2.2 regarding the dialog fix
pirat89 Feb 25, 2022
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
4 changes: 2 additions & 2 deletions leapp/dialogs/dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def get_answers(self, store):
:return: Dictionary with answers once retrieved
"""
store.translate(self)
return dict(store.get(self.scope, {}))
return store.get(self.scope, {})

def request_answers(self, store, renderer):
"""
Expand All @@ -114,4 +114,4 @@ def request_answers(self, store, renderer):
self._store = store
renderer.render(self)
self._store = None
return dict(store.get(self.scope, {}))
return store.get(self.scope, {})
6 changes: 4 additions & 2 deletions leapp/messaging/answerstore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,11 @@ def get(self, scope, fallback=None):

:param scope: Scope of the data to retrieve.
:param fallback: Fallback value to return if not found.
:return:
:return: A shallow copy of data stored in _storage by scope key
"""
answer = self._storage.get(scope, fallback)
# NOTE(ivasilev) self.storage.get() will return a DictProxy. To avoid TypeError during later
# JSON serialization a copy() should be invoked to get a shallow copy of data
answer = self._storage.get(scope, fallback).copy()
create_audit_entry('dialog-answer', {'scope': scope, 'fallback': fallback, 'answer': answer})
return answer

Expand Down
2 changes: 1 addition & 1 deletion packaging/leapp.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# This is kind of help for more flexible development of leapp repository,
# so people do not have to wait for new official release of leapp to ensure
# it is installed/used the compatible one.
%global framework_version 2.1
%global framework_version 2.2

# IMPORTANT: everytime the requirements are changed, increment number by one
# - same for Provides in deps subpackage
Expand Down