Skip to content

Commit 7eb4947

Browse files
committed
Smaller message when keyring installed but finds no backend
1 parent 60b3327 commit 7eb4947

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

twine/auth.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@
1313
# pre-built wheels for ppc64le and s390x, see #1158.
1414
if TYPE_CHECKING:
1515
import keyring
16+
from keyring.errors import NoKeyringError
1617
else:
1718
try:
1819
import keyring
20+
from keyring.errors import NoKeyringError
1921
except ModuleNotFoundError: # pragma: no cover
2022
keyring = None
23+
NoKeyringError = None
2124

2225
from twine import exceptions
2326
from twine import utils
@@ -156,6 +159,8 @@ def get_password_from_keyring(self) -> Optional[str]:
156159
username = cast(str, self.username)
157160
logger.info("Querying keyring for password")
158161
return cast(str, keyring.get_password(system, username))
162+
except NoKeyringError:
163+
logger.info("No keyring backend found")
159164
except Exception as exc:
160165
logger.warning("Error getting password from keyring", exc_info=exc)
161166
return None

0 commit comments

Comments
 (0)