diff --git a/puren_tonbo/tools/ptcipher.py b/puren_tonbo/tools/ptcipher.py index d062c88..b4326f9 100755 --- a/puren_tonbo/tools/ptcipher.py +++ b/puren_tonbo/tools/ptcipher.py @@ -130,7 +130,7 @@ def usage(): default_password_value = '' # empty password, cause a bad password error else: default_password_value = None - password = options.password or password_file or os.environ.get('PT_PASSWORD') or default_password_value + password = options.password or password_file or os.environ.get('PT_PASSWORD') or puren_tonbo.keyring_get_password() or default_password_value if password is None: password = getpass.getpass("Password:") if not isinstance(password, bytes): diff --git a/puren_tonbo/tools/pttkview.py b/puren_tonbo/tools/pttkview.py index f6000bb..9a02e19 100644 --- a/puren_tonbo/tools/pttkview.py +++ b/puren_tonbo/tools/pttkview.py @@ -109,7 +109,7 @@ def usage(): else: default_password_value = getpass.getpass("Password:") # FIXME don't do this """ - password = options.password or password_file or os.environ.get('PT_PASSWORD') or default_password_value + password = options.password or password_file or os.environ.get('PT_PASSWORD') or puren_tonbo.keyring_get_password() or default_password_value if is_win: # before GUI code, inform Windows to use the icon provided at runtime, not from the (exe) resource