From 6f52e2eb230684c01719e16b4dbd6447c32d3722 Mon Sep 17 00:00:00 2001
From: correctmost <134317971+correctmost@users.noreply.github.com>
Date: Sat, 16 Nov 2024 16:49:08 -0500
Subject: [PATCH] Enable arguments-renamed Pylint rule and fix warnings

---
 archinstall/lib/disk/partitioning_menu.py         | 6 +++---
 archinstall/lib/disk/subvolume_menu.py            | 4 ++--
 archinstall/lib/general.py                        | 8 ++++----
 archinstall/lib/interactions/manage_users_conf.py | 4 ++--
 archinstall/lib/interactions/network_menu.py      | 4 ++--
 archinstall/lib/mirrors.py                        | 4 ++--
 pyproject.toml                                    | 1 -
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/archinstall/lib/disk/partitioning_menu.py b/archinstall/lib/disk/partitioning_menu.py
index b37ad2b092..d9ae62aa91 100644
--- a/archinstall/lib/disk/partitioning_menu.py
+++ b/archinstall/lib/disk/partitioning_menu.py
@@ -52,11 +52,11 @@ def __init__(self, prompt: str, device: BDevice, device_partitions: list[Partiti
 		display_actions = list(self._actions.values())
 		super().__init__(prompt, device_partitions, display_actions[:2], display_actions[3:])
 
-	def selected_action_display(self, partition: PartitionModification) -> str:
-		if partition.status == ModificationStatus.Create:
+	def selected_action_display(self, selection: PartitionModification) -> str:
+		if selection.status == ModificationStatus.Create:
 			return str(_('Partition - New'))
 		else:
-			return str(partition.dev_path)
+			return str(selection.dev_path)
 
 	def filter_options(self, selection: PartitionModification, options: list[str]) -> list[str]:
 		not_filter = []
diff --git a/archinstall/lib/disk/subvolume_menu.py b/archinstall/lib/disk/subvolume_menu.py
index dbbd6c2b10..3257821591 100644
--- a/archinstall/lib/disk/subvolume_menu.py
+++ b/archinstall/lib/disk/subvolume_menu.py
@@ -22,8 +22,8 @@ def __init__(self, prompt: str, btrfs_subvols: list[SubvolumeModification]):
 		]
 		super().__init__(prompt, btrfs_subvols, [self._actions[0]], self._actions[1:])
 
-	def selected_action_display(self, subvolume: SubvolumeModification) -> str:
-		return str(subvolume.name)
+	def selected_action_display(self, selection: SubvolumeModification) -> str:
+		return str(selection.name)
 
 	def _add_subvolume(self, preset: SubvolumeModification | None = None) -> SubvolumeModification | None:
 		result = EditMenu(
diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index aa07705a5c..de2327fb04 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -87,8 +87,8 @@ class JSON(json.JSONEncoder, json.JSONDecoder):
 	A safe JSON encoder that will omit private information in dicts (starting with !)
 	"""
 
-	def encode(self, obj: Any) -> str:
-		return super().encode(jsonify(obj))
+	def encode(self, o: Any) -> str:
+		return super().encode(jsonify(o))
 
 
 class UNSAFE_JSON(json.JSONEncoder, json.JSONDecoder):
@@ -96,8 +96,8 @@ class UNSAFE_JSON(json.JSONEncoder, json.JSONDecoder):
 	UNSAFE_JSON will call/encode and keep private information in dicts (starting with !)
 	"""
 
-	def encode(self, obj: Any) -> str:
-		return super().encode(jsonify(obj, safe=False))
+	def encode(self, o: Any) -> str:
+		return super().encode(jsonify(o, safe=False))
 
 
 class SysCommandWorker:
diff --git a/archinstall/lib/interactions/manage_users_conf.py b/archinstall/lib/interactions/manage_users_conf.py
index e8fe8ef6dc..a0905305b2 100644
--- a/archinstall/lib/interactions/manage_users_conf.py
+++ b/archinstall/lib/interactions/manage_users_conf.py
@@ -28,8 +28,8 @@ def __init__(self, prompt: str, lusers: list[User]):
 		]
 		super().__init__(prompt, lusers, [self._actions[0]], self._actions[1:])
 
-	def selected_action_display(self, user: User) -> str:
-		return user.username
+	def selected_action_display(self, selection: User) -> str:
+		return selection.username
 
 	def handle_action(self, action: str, entry: User | None, data: list[User]) -> list[User]:
 		if action == self._actions[0]:  # add
diff --git a/archinstall/lib/interactions/network_menu.py b/archinstall/lib/interactions/network_menu.py
index 6eea6c9ba1..ba54360600 100644
--- a/archinstall/lib/interactions/network_menu.py
+++ b/archinstall/lib/interactions/network_menu.py
@@ -26,8 +26,8 @@ def __init__(self, prompt: str, preset: list[Nic]):
 		]
 		super().__init__(prompt, preset, [self._actions[0]], self._actions[1:])
 
-	def selected_action_display(self, nic: Nic) -> str:
-		return nic.iface if nic.iface else ''
+	def selected_action_display(self, selection: Nic) -> str:
+		return selection.iface if selection.iface else ''
 
 	def handle_action(self, action: str, entry: Nic | None, data: list[Nic]) -> list[Nic]:
 		if action == self._actions[0]:  # add
diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py
index 9ef17c3564..bbc071928e 100644
--- a/archinstall/lib/mirrors.py
+++ b/archinstall/lib/mirrors.py
@@ -137,8 +137,8 @@ def __init__(self, custom_mirrors: list[CustomMirror]):
 			self._actions[1:]
 		)
 
-	def selected_action_display(self, mirror: CustomMirror) -> str:
-		return mirror.name
+	def selected_action_display(self, selection: CustomMirror) -> str:
+		return selection.name
 
 	def handle_action(
 		self,
diff --git a/pyproject.toml b/pyproject.toml
index aff881e739..338be18adc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -134,7 +134,6 @@ max-line-length = 220
 disable = [
     "C",
     "R",
-    "arguments-renamed",
     "attribute-defined-outside-init",
     "bad-indentation",
     "bare-except",