From c105d6f18a5a17b0a47fda5a2df2f8f47352b037 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 24 Apr 2016 23:25:33 -0500 Subject: Simplify logic by eliminating retries in password prompt and returning results directly. --- setuptools/command/upload.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'setuptools/command/upload.py') diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py index a001d461..484baa5a 100644 --- a/setuptools/command/upload.py +++ b/setuptools/command/upload.py @@ -24,21 +24,15 @@ class upload(orig.upload): """ try: keyring = __import__('keyring') - password = keyring.get_password(self.repository, self.username) + return keyring.get_password(self.repository, self.username) except Exception: - password = None - finally: - return password + pass def _prompt_for_password(self): """ Prompt for a password on the tty. Suppress Exceptions. """ - password = None try: - while not password: - password = getpass.getpass() + return getpass.getpass() except (Exception, KeyboardInterrupt): - password = None - finally: - return password + pass -- cgit v1.2.3