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

Jump to bottom

Fix KWallet.get_credential() regression #463

Merged
merged 3 commits into from Sep 12, 2020
Merged

Fix KWallet.get_credential() regression #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d48913
Fix return type of KWallet get_credential()
MrAnno Sep 1, 2020
cda8fd6
Omit 'return None' as it's implied.
jaraco Sep 12, 2020
91f65be
Update changelog. Ref #463.
jaraco Sep 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGES.rst
View file
Open in desktop
@@ -1,3 +1,10 @@
v21.4.1
-------

* #463: Fixed regression in KWallet ``get_credential``
where a simple string was returned instead of a
SimpleCredential.

v21.4.0
-------

Expand Down
3 changes: 2 additions & 1 deletion keyring/backends/kwallet.py
View file
Open in desktop
Expand Up @@ -123,7 +123,8 @@ def get_credential(self, service, username):
Otherwise, it will return the first username and password combo that it finds.
"""
if username is not None:
return self.get_password(service, username)
return super().get_credential(service, username)

if not self.connected(service):
# the user pressed "cancel" when prompted to unlock their keyring.
raise KeyringLocked("Failed to unlock the keyring!")
Expand Down