optional keyring support

clach04 · Aug 27, 2023 · 3413d8b · 3413d8b
1 parent ed28be2
commit 3413d8b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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