From 3fb372fb113fb3cb636b7d24e2978550995d8e19 Mon Sep 17 00:00:00 2001
From: Athanasius <Athanasius@miggy.org>
Date: Sun, 22 Jan 2023 13:09:34 +0000
Subject: [PATCH] EDSM: Remove actually un-necessary, and bug-inducing "not
 None" checks

I would have added these during a mypy cleanup, but it turns out they're both
not necessary *and* it actually prevents the EDSM Settings tab from properly
populating.
---
 plugins/edsm.py | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/plugins/edsm.py b/plugins/edsm.py
index d68a3491..a48177e0 100644
--- a/plugins/edsm.py
+++ b/plugins/edsm.py
@@ -327,30 +327,27 @@ def plugin_prefs(parent: ttk.Notebook, cmdr: str | None, is_beta: bool) -> tk.Fr
     if this.label:
         this.label.grid(columnspan=2, padx=PADX, sticky=tk.W)
 
-    if this.cmdr_label and this.cmdr_text:
-        # LANG: Game Commander name label in EDSM settings
-        this.cmdr_label = nb.Label(frame, text=_('Cmdr'))  # Main window
-        this.cmdr_label.grid(row=cur_row, padx=PADX, sticky=tk.W)
-        this.cmdr_text = nb.Label(frame)
-        this.cmdr_text.grid(row=cur_row, column=1, padx=PADX, pady=PADY, sticky=tk.W)
+    # LANG: Game Commander name label in EDSM settings
+    this.cmdr_label = nb.Label(frame, text=_('Cmdr'))  # Main window
+    this.cmdr_label.grid(row=cur_row, padx=PADX, sticky=tk.W)
+    this.cmdr_text = nb.Label(frame)
+    this.cmdr_text.grid(row=cur_row, column=1, padx=PADX, pady=PADY, sticky=tk.W)
 
     cur_row += 1
 
-    if this.user_label and this.label:
-        # LANG: EDSM Commander name label in EDSM settings
-        this.user_label = nb.Label(frame, text=_('Commander Name'))  # EDSM setting
-        this.user_label.grid(row=cur_row, padx=PADX, sticky=tk.W)
-        this.user = nb.Entry(frame)
-        this.user.grid(row=cur_row, column=1, padx=PADX, pady=PADY, sticky=tk.EW)
+    # LANG: EDSM Commander name label in EDSM settings
+    this.user_label = nb.Label(frame, text=_('Commander Name'))  # EDSM setting
+    this.user_label.grid(row=cur_row, padx=PADX, sticky=tk.W)
+    this.user = nb.Entry(frame)
+    this.user.grid(row=cur_row, column=1, padx=PADX, pady=PADY, sticky=tk.EW)
 
     cur_row += 1
 
-    if this.apikey_label and this.apikey:
-        # LANG: EDSM API key label
-        this.apikey_label = nb.Label(frame, text=_('API Key'))  # EDSM setting
-        this.apikey_label.grid(row=cur_row, padx=PADX, sticky=tk.W)
-        this.apikey = nb.Entry(frame)
-        this.apikey.grid(row=cur_row, column=1, padx=PADX, pady=PADY, sticky=tk.EW)
+    # LANG: EDSM API key label
+    this.apikey_label = nb.Label(frame, text=_('API Key'))  # EDSM setting
+    this.apikey_label.grid(row=cur_row, padx=PADX, sticky=tk.W)
+    this.apikey = nb.Entry(frame)
+    this.apikey.grid(row=cur_row, column=1, padx=PADX, pady=PADY, sticky=tk.EW)
 
     prefs_cmdr_changed(cmdr, is_beta)