diff options
Diffstat (limited to 'setuptools/command/upload.py')
| -rw-r--r-- | setuptools/command/upload.py | 14 |
1 files changed, 4 insertions, 10 deletions
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 |