Skip to content

Commit

Permalink
Merge pull request #463 from MrAnno/fix-kwallet-get-credentials
Browse files Browse the repository at this point in the history
Fix KWallet.get_credential() regression
  • Loading branch information
jaraco committed Sep 12, 2020
2 parents 7b561d3 + 91f65be commit 94a1ef6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
7 changes: 7 additions & 0 deletions CHANGES.rst
@@ -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
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

0 comments on commit 94a1ef6

Please sign in to comment.