chore: Another batch of ruff check --fix

Author: C0rn3j

scc/foreign/vdf.py

@@ -1,24 +1,40 @@
 #!/usr/bin/env python3
-"""
-Imports VDF profile and converts it to Profile object.
+"""Imports VDF profile and converts it to Profile object.
 """
 
-from scc.uinput import Keys, Axes, Rels
-from scc.actions import Action, NoAction, ButtonAction, DPadAction, XYAction
-from scc.actions import HatRightAction, TriggerAction, MouseAction
-from scc.actions import HatUpAction, HatDownAction, HatLeftAction
-from scc.actions import AxisAction, RelAreaAction, MultiAction
-from scc.special_actions import ChangeProfileAction, GridMenuAction, RadialMenuAction, MenuAction
-from scc.modifiers import SensitivityModifier, ClickModifier, FeedbackModifier
-from scc.constants import SCButtons, HapticPos, TRIGGER_CLICK, YAW, ROLL
-from scc.modifiers import BallModifier, DoubleclickModifier
-from scc.modifiers import HoldModifier, ModeModifier
-from scc.parser import ActionParser, ParseError
+import logging
+
+from scc.actions import (
+	Action,
+	AxisAction,
+	ButtonAction,
+	DPadAction,
+	HatDownAction,
+	HatLeftAction,
+	HatRightAction,
+	HatUpAction,
+	MouseAction,
+	MultiAction,
+	NoAction,
+	RelAreaAction,
+	TriggerAction,
+	XYAction,
+)
+from scc.constants import ROLL, TRIGGER_CLICK, YAW, HapticPos, SCButtons
+from scc.lib.vdf import ensure_list, parse_vdf
 from scc.menu_data import MenuData, MenuItem
+from scc.modifiers import (
+	BallModifier,
+	DoubleclickModifier,
+	FeedbackModifier,
+	HoldModifier,
+	ModeModifier,
+	SensitivityModifier,
+)
+from scc.parser import ActionParser, ParseError
 from scc.profile import Profile
-from scc.lib.vdf import parse_vdf, ensure_list
-
-import logging
+from scc.special_actions import ChangeProfileAction, GridMenuAction, MenuAction, RadialMenuAction
+from scc.uinput import Axes, Keys, Rels
 
 log = logging.getLogger("import.vdf")
 
@@ -87,8 +103,7 @@ def __init__(self, name="Unnamed"):
 		self.action_set_switches = set()
 
 	def parse_action(self, lst_or_str, button=None):
-		"""
-		Parses action from vdf file. a_string can be either string or list of
+		"""Parses action from vdf file. a_string can be either string or list of
 		strings, in which case MultiAction is returned.
 
 		Returns Action instance or ParseError if action is not recognized.
@@ -158,8 +173,7 @@ def parse_action(self, lst_or_str, button=None):
 
 	@staticmethod
 	def parse_modifiers(group, action, side):
-		"""
-		If passed group or activator has 'settings' key, converts known
+		"""If passed group or activator has 'settings' key, converts known
 		settings to one or more Modifier.
 
 		Returns resulting Action
@@ -221,17 +235,16 @@ def convert_button_name(name):
 		raise ParseError("Unknown button: '%s'" % (name,))
 
 	def parse_button(self, bdef, button=None):
-		"""
-		Parses button definition from vdf file.
+		"""Parses button definition from vdf file.
 		Parameter can be either string, as used in v2, or dict used in v3.
 		"""
 		if type(bdef) == str:
 			# V2
 			return self.parse_action(bdef, button)
-		elif type(bdef) == list:
+		if type(bdef) == list:
 			# V2
 			return MultiAction.make(*[self.parse_action(x, button) for x in bdef])
-		elif "activators" in bdef:
+		if "activators" in bdef:
 			# V3
 			act_actions = []
 			for k in ("Full_Press", "Double_Press", "Long_Press"):
@@ -246,19 +259,16 @@ def parse_button(self, bdef, button=None):
 			normal, double, hold = act_actions
 			if not double and not hold:
 				return normal
-			elif hold and not double:
+			if hold and not double:
 				return HoldModifier(hold, normal)
-			else:
-				action = DoubleclickModifier(double, normal)
-				action.holdaction = hold
-				return action
-		else:
-			log.warning("Failed to parse button definition: %s" % (bdef,))
+			action = DoubleclickModifier(double, normal)
+			action.holdaction = hold
+			return action
+		log.warning("Failed to parse button definition: %s" % (bdef,))
 
 	@staticmethod
 	def get_inputs(group):
-		"""
-		Returns 'inputs' or 'bindings', whichever exists in passed group.
+		"""Returns 'inputs' or 'bindings', whichever exists in passed group.
 		If neither exists, return None.
 		"""
 		if "inputs" in group:
@@ -276,11 +286,10 @@ def find_group(data, id):
 		return None
 
 	def parse_group(self, group, side):
-		"""
-		Parses output (group) from vdf profile.
+		"""Parses output (group) from vdf profile.
 		Returns Action.
 		"""
-		if not "mode" in group:
+		if "mode" not in group:
 			raise ParseError("Group without mode")
 		mode = group["mode"]
 		inputs = VDFProfile.get_inputs(group)
@@ -342,7 +351,7 @@ def parse_group(self, group, side):
 						"item_%s" % (next_item_id,),
 						action.describe(Action.AC_BUTTON),
 						action,
-					)
+					),
 				)
 				next_item_id += 1
 			# Menu is stored in profile, with generated ID
@@ -446,9 +455,7 @@ def parse_switches(self, group):
 	def parse_input_binding(self, data, group_id, binding):
 		group = VDFProfile.find_group(data, group_id)
 		if group and "mode" in group:
-			if binding.startswith("switch"):
-				self.parse_switches(group)
-			elif binding.startswith("button_diamond"):
+			if binding.startswith("switch") or binding.startswith("button_diamond"):
 				self.parse_switches(group)
 			else:
 				if binding.startswith("right_"):
@@ -498,25 +505,25 @@ def get_by_binding(self, binding):
 		"""
 		if binding in SCButtons.__members__.values():
 			return self.buttons[binding]
-		elif binding.startswith("left_trackpad"):
+		if binding.startswith("left_trackpad"):
 			return self.pads[Profile.LEFT]
-		elif binding.startswith("right_trackpad"):
+		if binding.startswith("right_trackpad"):
 			return self.pads[Profile.RIGHT]
-		elif binding.startswith("left_trigger"):
+		if binding.startswith("left_trigger"):
 			return self.triggers[Profile.LEFT]
-		elif binding.startswith("right_trigger"):
+		if binding.startswith("right_trigger"):
 			return self.triggers[Profile.RIGHT]
-		elif binding.startswith("joystick"):
+		if binding.startswith("joystick"):
 			return self.stick
-		elif binding.startswith("gyro"):
+		if binding.startswith("gyro"):
 			return self.gyro
 		raise ParseError("Unknown group source binding: '%s'" % (binding,))
 
 	@staticmethod
 	def _load_preset(data, profile, preset):
 		profile.modeshifts = {}
 		profile.modeshift_buttons = {}
-		if not "group_source_bindings" in preset:
+		if "group_source_bindings" not in preset:
 			# Empty preset
 			return
 
@@ -567,7 +574,7 @@ def load(self, filename):
 
 		May raise ValueError.
 		"""
-		with open(filename, "r") as file:
+		with open(filename) as file:
 			data = parse_vdf(file)
 		self.load_data(data)
 

scc/foreign/vdffz.py

@@ -1,23 +1,24 @@
 #!/usr/bin/env python3
-"""
-Imports VDFFZ profile and converts it to Profile object.
+"""Imports VDFFZ profile and converts it to Profile object.
 VDFFZ is just VDF encapsulated in json, so this just gets one value and calls
 VDFProfile to decode rest.
 """
 
-from .vdf import VDFProfile
+import json
+import logging
+
 from scc.lib.vdf import parse_vdf
 
-import json, logging
+from .vdf import VDFProfile
 
 log = logging.getLogger("import.vdffz")
 
 
 class VDFFZProfile(VDFProfile):
 	def load(self, filename):
 		try:
-			data = json.loads(open(filename, "r").read())
-		except Exception as e:
+			data = json.loads(open(filename).read())
+		except Exception:
 			raise ValueError("Failed to parse JSON")
 		if "ConfigData" not in data:
 			raise ValueError("ConfigData missing in JSON")

scc/gui/action_editor.py

@@ -4,19 +4,17 @@
 """
 
 from __future__ import annotations
+
 import importlib
 import logging
 import math
-import os
-import types
 
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import GLib, Gtk
 
-from scc.actions import Action, NoAction, RingAction, TriggerAction, XYAction
+from scc.actions import Action, NoAction, RingAction, TriggerAction
 from scc.constants import CUT, LINEAR, MINIMUM, ROUND, HapticPos, SCButtons
-from scc.controller import HapticData
 from scc.gui.ae import AEComponent
-from scc.gui.controller_widget import BUTTONS, GYROS, PADS, PRESSABLE, STICKS, TRIGGERS
+from scc.gui.controller_widget import GYROS, PADS, PRESSABLE, STICKS, TRIGGERS
 from scc.gui.dwsnc import headerbar
 from scc.gui.editor import Editor
 from scc.gui.macro_editor import MacroEditor
@@ -31,14 +29,13 @@
 	DeadzoneModifier,
 	FeedbackModifier,
 	ModeModifier,
-	Modifier,
 	NameModifier,
 	RotateInputModifier,
 	SensitivityModifier,
 	SmoothModifier,
 )
 from scc.profile import Profile
-from scc.special_actions import GesturesAction, MenuAction, OSDAction
+from scc.special_actions import OSDAction
 from scc.tools import _, nameof
 
 log = logging.getLogger("ActionEditor")
@@ -151,7 +148,7 @@ def setup_widgets(self):
 					self.builder.get_object("lblSens%s" % (XYZ[i],)),
 					self.builder.get_object("btClearSens%s" % (XYZ[i],)),
 					self.builder.get_object("cbSensInvert%s" % (XYZ[i],)),
-				)
+				),
 			)
 		for key in AFP:
 			i = AFP.index(key)
@@ -162,7 +159,7 @@ def setup_widgets(self):
 					self.builder.get_object("lblF%s" % (key,)),
 					self.builder.get_object("btClearF%s" % (key,)),
 					self.feedback[i],  # default value
-				)
+				),
 			)
 		for key in SMT:
 			i = SMT.index(key)
@@ -172,7 +169,7 @@ def setup_widgets(self):
 					self.builder.get_object("sclSmooth%s" % (key,)),
 					self.builder.get_object("btClearSmooth%s" % (key,)),
 					self.builder.get_object("sclSmooth%s" % (key,)).get_value(),
-				)
+				),
 			)
 		for key in DZN:
 			i = DZN.index(key)
@@ -183,7 +180,7 @@ def setup_widgets(self):
 					self.builder.get_object("sclDZ%s" % (key,)),
 					self.builder.get_object("btClearDZ%s" % (key,)),
 					self.deadzone[i],  # default value
-				)
+				),
 			)
 
 		if self.app.osd_mode:
@@ -386,29 +383,25 @@ def hide_modifiers(self):
 		self.builder.get_object("exMore").set_visible(False)
 
 	def hide_advanced_settings(self):
-		"""
-		Hides entire 'Advanced Settings' expander.
+		"""Hides entire 'Advanced Settings' expander.
 		"""
 		self.builder.get_object("exMore").set_visible(False)
 		self.builder.get_object("rvMore").set_visible(False)
 
 	def hide_modeshift(self):
-		"""
-		Hides Mode Shift button.
+		"""Hides Mode Shift button.
 		Used when displaying ActionEditor from ModeshiftEditor
 		"""
 		self.builder.get_object("btModeshift").set_visible(False)
 
 	def hide_macro(self):
-		"""
-		Hides Macro button.
+		"""Hides Macro button.
 		Used when editing macro of pad/stick bindings.
 		"""
 		self.builder.get_object("btMacro").set_visible(False)
 
 	def hide_ring(self):
-		"""
-		Hides Ring Bindings button.
+		"""Hides Ring Bindings button.
 		Used when editing anything but pad.
 		"""
 		self.builder.get_object("btInnerRing").set_visible(False)
@@ -918,8 +911,7 @@ def on_cbPreview_toggled(self, cb):
 			self._replaced_action = None
 
 	def enable_preview(self, action):
-		"""
-		Enables or disables and hides 'preview immediately' option, based on
+		"""Enables or disables and hides 'preview immediately' option, based on
 		if currently selected action supports it.
 		"""
 		cbPreview = self.builder.get_object("cbPreview")
@@ -928,8 +920,7 @@ def enable_preview(self, action):
 		cbPreview.set_sensitive(enabled)
 
 	def enable_modifiers(self, action):
-		"""
-		Enables or disables and hides modifier settings according to what
+		"""Enables or disables and hides modifier settings according to what
 		is applicable for specified action AND what's allowed for current
 		editor mode.
 
@@ -1048,10 +1039,9 @@ def on_sclFFrequency_format_value(self, scale, value):
 	def on_sclFriction_format_value(self, scale, value):
 		if value <= 0:
 			return "%0.3f" % (0,)
-		elif value >= 6:
+		if value >= 6:
 			return "%0.3f" % (1000.00,)
-		else:
-			return "%0.3f" % ((10.0**value) / 1000.0)
+		return "%0.3f" % ((10.0**value) / 1000.0)
 
 	def on_btClearFriction_clicked(self, *a):
 		sclFriction = self.builder.get_object("sclFriction")