ui: rename format vars and args

ilius · Dec 14, 2024 · 4c95f4f · 4c95f4f
1 parent 18d7851
commit 4c95f4f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/pyglossary/ui/tools/view_glossary.py b/pyglossary/ui/tools/view_glossary.py
@@ -57,15 +57,15 @@ def highlightEntry(entry: EntryType) -> None:
 
 def viewGlossary(
 	filename: str,
-	format: str | None = None,
+	formatName: str | None = None,
 	glos: GlossaryType | None = None,
 ) -> None:
 	highlightEntry = getEntryHighlighter()
 
 	if glos is None:
 		glos = Glossary(ui=None)
 
-	if not glos.directRead(filename, formatName=format):
+	if not glos.directRead(filename, formatName=formatName):
 		return
 
 	pagerCmd = ["less", "-R"]
@@ -111,11 +111,11 @@ def handleEntry(entry: EntryType) -> None:
 
 def main() -> None:
 	filename = sys.argv[1]
-	format = None
+	formatName = None
 	if len(sys.argv) > 2:
-		format = sys.argv[2]
+		formatName = sys.argv[2]
 	filename = os.path.expanduser(filename)
-	viewGlossary(filename, formatName=format)
+	viewGlossary(filename, formatName=formatName)
 
 
 if __name__ == "__main__":

diff --git a/pyglossary/ui/ui_tk.py b/pyglossary/ui/ui_tk.py
@@ -545,7 +545,7 @@ class FormatOptionsDialog(tk.Toplevel):
 
 	def __init__(
 		self,
-		format,
+		formatName,
 		kind,
 		values,
 		master=None,  # noqa: ARG002
@@ -558,11 +558,11 @@ def __init__(
 		self.bind("<Escape>", lambda _e: self.destroy())
 
 		self.menu = None
-		self.format = format
+		self.format = formatName
 		self.kind = kind
 		self.values = values
-		self.options = list(self.kindFormatsOptions[kind][format])
-		self.optionsProp = Glossary.plugins[format].optionsProp
+		self.options = list(self.kindFormatsOptions[kind][formatName])
+		self.optionsProp = Glossary.plugins[formatName].optionsProp
 
 		self.createOptionsList()
 
@@ -635,7 +635,7 @@ def createOptionsList(self):
 	def valueMenuItemCustomSelected(
 		self,
 		treev,
-		format: str,
+		formatName: str,
 		optName: str,
 		menu=None,
 	):
@@ -672,7 +672,7 @@ def valueMenuItemCustomSelected(
 		entry.insert(0, value)
 		entry.pack(fill="x")
 
-		prop = Glossary.plugins[format].optionsProp[optName]
+		prop = Glossary.plugins[formatName].optionsProp[optName]
 
 		def customOkClicked(_event=None):
 			rawValue = entry.get()
@@ -873,9 +873,13 @@ def buttonClicked(self):
 		formatD = self.formatInput.get()
 		if not formatD:
 			return
-		format = pluginByDesc[formatD].name
 
-		dialog = FormatOptionsDialog(format, self.kind, self.values, master=self)
+		dialog = FormatOptionsDialog(
+			pluginByDesc[formatD].name,
+			self.kind,
+			self.values,
+			master=self,
+		)
 
 		# x, y, w, h = decodeGeometry(dialog.geometry())
 		w, h = 380, 250
@@ -1296,8 +1300,7 @@ def inputFormatChanged(self, *_args):
 		if not formatDesc:
 			return
 		self.readOptions.clear()  # reset the options, DO NOT re-assign
-		format = pluginByDesc[formatDesc].name
-		if Glossary.formatsReadOptions[format]:
+		if Glossary.formatsReadOptions[pluginByDesc[formatDesc].name]:
 			self.readOptionsButton.grid(
 				row=self.inputFormatRow,
 				column=3,
@@ -1313,14 +1316,14 @@ def outputFormatChanged(self, *_args):
 		if not formatDesc:
 			return
 
-		format = pluginByDesc[formatDesc].name
-		plugin = Glossary.plugins.get(format)
+		formatName = pluginByDesc[formatDesc].name
+		plugin = Glossary.plugins.get(formatName)
 		if not plugin:
-			log.error(f"plugin {format} not found")
+			log.error(f"plugin {formatName} not found")
 			return
 
 		self.writeOptions.clear()  # reset the options, DO NOT re-assign
-		if Glossary.formatsWriteOptions[format]:
+		if Glossary.formatsWriteOptions[formatName]:
 			self.writeOptionsButton.grid(
 				row=self.outputFormatRow,
 				column=3,