Ensure deref returns a string and not None. Closes #160

Author: firecat53

keepmenu/totp.py

@@ -133,7 +133,7 @@ def get_otp_url(kp_entry):
     """
     otp_url = ""
     if hasattr(kp_entry, "otp"):
-        otp_url = kp_entry.deref("otp")
+        otp_url = kp_entry.deref("otp") or ""
     else:
         otp_url = kp_entry.get_custom_property("otp")
     if otp_url:

keepmenu/type.py

@@ -127,11 +127,11 @@ def type_entry(entry, db_autotype=None):
     libraries.get(library, type_entry_pynput)(entry, tokens)
 
 PLACEHOLDER_AUTOTYPE_TOKENS = {
-    "{TITLE}"   : lambda e: e.deref('title'),
-    "{USERNAME}": lambda e: e.deref('username'),
-    "{URL}"     : lambda e: e.deref('url'),
-    "{PASSWORD}": lambda e: e.deref('password'),
-    "{NOTES}"   : lambda e: e.deref('notes'),
+    "{TITLE}"   : lambda e: e.deref('title') or "",
+    "{USERNAME}": lambda e: e.deref('username') or "",
+    "{URL}"     : lambda e: e.deref('url') or "",
+    "{PASSWORD}": lambda e: e.deref('password') or "",
+    "{NOTES}"   : lambda e: e.deref('notes') or "",
     "{TOTP}"    : lambda e: gen_otp(get_otp_url(e)),
     "{TIMEOTP}" : lambda e: gen_otp(get_otp_url(e)),
 }

keepmenu/view.py

@@ -21,8 +21,8 @@ def view_all_entries(options, kp_entries, dbname):
     kps = str("\n").join([kp_entry_pattern.format(j,
                                                   os.path.join("/".join(i.path[:-1]),
                                                                i.deref('title') or ""),
-                                                  i.deref('username'),
-                                                  i.deref('url'),
+                                                  i.deref('username') or "",
+                                                  i.deref('url') or "",
                                                   na=num_align)
                          for j, i in enumerate(kp_entries)])
     if options:
@@ -74,11 +74,11 @@ def view_entry(kp_entry):
 
     sel = dmenu_select(len(fields), inp="\n".join(fields))
     if sel == "Notes: <Enter to view>":
-        sel = view_notes(kp_entry.deref('notes'))
+        sel = view_notes(kp_entry.deref('notes') or "")
     elif sel == "Notes: None":
         sel = ""
     elif sel == '**********':
-        sel = kp_entry.deref('password')
+        sel = kp_entry.deref('password') or ""
     elif sel == "TOTP: ******":
         sel = gen_otp(get_otp_url(kp_entry))
     elif sel == fields[4] and not keepmenu.CONF.getboolean("database", "type_url", fallback=False):