Merge pull request #82 from chennes/unusedLocals

Eliminate unused local variables

Author: chennes

AddonManagerOptions.py

@@ -97,7 +97,7 @@ def recursive_widget_saver(self, widget):
                     pref.SetString(str(pref_entry, "utf-8"), text)
                 elif widget.metaObject().className() == "Gui::PrefFileChooser":
                     filename = str(widget.property("fileName"))
-                    filename = pref.SetString(str(pref_entry, "utf-8"), filename)
+                    pref.SetString(str(pref_entry, "utf-8"), filename)
 
         # Recurse over children
         if isinstance(widget, QtCore.QObject):

AddonManagerTest/app/test_licenses.py

@@ -36,7 +36,7 @@ def tearDown(self) -> None:
         pass
 
     def test_instantiate_license_manager(self):
-        manager = addonmanager_licenses.SPDXLicenseManager()
+        _ = addonmanager_licenses.SPDXLicenseManager()
         # Should not raise an exception...
 
     def test_is_osi_approved(self):

AddonManagerTest/app/test_uninstaller.py

@@ -92,9 +92,9 @@ def test_uninstall_no_name(self):
         """Test the integrated uninstall function for an addon without a name"""
 
         with tempfile.TemporaryDirectory() as temp_dir:
-            toplevel_path = self.setup_dummy_installation(temp_dir)
+            _ = self.setup_dummy_installation(temp_dir)
             self.mock_addon.name = None
-            result = self.test_object.run()
+            _ = self.test_object.run()
             self.assertTrue(os.path.exists(temp_dir))
             self.assertIn("failure", self.signals_caught)
             self.assertNotIn("success", self.signals_caught)
@@ -104,9 +104,9 @@ def test_uninstall_dangerous_name(self):
         """Test the integrated uninstall function for an addon with a dangerous name"""
 
         with tempfile.TemporaryDirectory() as temp_dir:
-            toplevel_path = self.setup_dummy_installation(temp_dir)
+            _ = self.setup_dummy_installation(temp_dir)
             self.mock_addon.name = "./"
-            result = self.test_object.run()
+            _ = self.test_object.run()
             self.assertTrue(os.path.exists(temp_dir))
             self.assertIn("failure", self.signals_caught)
             self.assertNotIn("success", self.signals_caught)
@@ -116,9 +116,9 @@ def test_uninstall_unmatching_name(self):
         """Test the integrated uninstall function for an addon with a name that isn't installed"""
 
         with tempfile.TemporaryDirectory() as temp_dir:
-            toplevel_path = self.setup_dummy_installation(temp_dir)
+            _ = self.setup_dummy_installation(temp_dir)
             self.mock_addon.name += "Nonexistent"
-            result = self.test_object.run()
+            _ = self.test_object.run()
             self.assertTrue(os.path.exists(temp_dir))
             self.assertIn("failure", self.signals_caught)
             self.assertNotIn("success", self.signals_caught)
@@ -134,7 +134,7 @@ def test_uninstall_addon_with_macros(self):
                 "FakeMacro.FCMacro",
                 os.path.join(toplevel_path, "AM_INSTALLATION_DIGEST.txt"),
             )
-            result = self.test_object.run()
+            _ = self.test_object.run()
             self.assertNotIn("failure", self.signals_caught)
             self.assertIn("success", self.signals_caught)
             self.assertIn("finished", self.signals_caught)
@@ -155,9 +155,9 @@ def func(self, *args):
 
         interceptor = Interceptor()
         with tempfile.TemporaryDirectory() as temp_dir:
-            toplevel_path = self.setup_dummy_installation(temp_dir)
+            _ = self.setup_dummy_installation(temp_dir)
             self.test_object.run_uninstall_script = interceptor.func
-            result = self.test_object.run()
+            _ = self.test_object.run()
             self.assertTrue(interceptor.called, "Failed to call uninstall script")
 
     def test_remove_extra_files_no_digest(self):

AddonManagerTest/gui/test_installer_gui.py

@@ -392,11 +392,13 @@ def test_ask_for_toolbar_no_dialog_default_exists(self, toolbar_adapter):
         self.skipTest("Test not updated to handle running outside FreeCAD")
         preferences_settings = {
             "alwaysAskForToolbar": False,
+            "FirstTimeAskingForToolbar": True,
             "CustomToolbarName": "UnitTestCustomToolbar",
         }
         preferences_replacement = fci.Preferences(preferences_settings)
-        with patch("addonmanager_installer_gui.fci.Preferences") as preferences:
-            preferences = lambda: preferences_replacement
+        with patch(
+            "addonmanager_installer_gui.fci.Preferences", return_value=preferences_replacement
+        ):
             result = self.installer._ask_for_toolbar([])
         self.assertIsNotNone(result)
         self.assertTrue(hasattr(result, "get"))
@@ -405,10 +407,14 @@ def test_ask_for_toolbar_no_dialog_default_exists(self, toolbar_adapter):
 
     def test_ask_for_toolbar_with_dialog_cancelled(self):
         """If the user cancels the dialog no toolbar is created"""
-        preferences_settings = {"alwaysAskForToolbar": True}
+        preferences_settings = {
+            "alwaysAskForToolbar": True,
+            "FirstTimeAskingForToolbar": True,
+        }
         preferences_replacement = fci.Preferences(preferences_settings)
-        with patch("addonmanager_installer_gui.fci.Preferences") as preferences:
-            preferences = lambda: preferences_replacement
+        with patch(
+            "addonmanager_installer_gui.fci.Preferences", return_value=preferences_replacement
+        ):
             _ = DialogWatcher(
                 translate("select_toolbar_dialog", "Select Toolbar"),
                 QtWidgets.QDialogButtonBox.Cancel,
@@ -445,7 +451,7 @@ def test_ask_for_toolbar_with_dialog_selection(self, toolbar_adapter):
         # Third test: the user selects a custom toolbar in the dialog, and checks the box to always
         # ask.
         self.skipTest("Test not updated to handle running outside FreeCAD")
-        dialog_interactor = DialogInteractor(
+        _ = DialogInteractor(
             translate("select_toolbar_dialog", "Select Toolbar"),
             self.interactor_selection_option_and_checkbox,
         )

AddonManagerTest/gui/test_widget_addon_buttons.py

@@ -33,4 +33,4 @@ class TestWidgetAddonButtons(unittest.TestCase):
     def test_instantiation(self):
         window = QtWidgets.QDialog()
         window.setObjectName("Test Widget Addon Buttons")
-        _buttons = WidgetAddonButtons(window)
+        _ = WidgetAddonButtons(window)

addonmanager_devmode_people_table.py

@@ -43,10 +43,10 @@ def __init__(self):
         )
         icon_path = os.path.join(os.path.dirname(__file__), "Resources", "icons")
         self.widget.addButton.setIcon(
-            QtGui.QIcon.fromTheme("add", QtGui.QIcon(os.path.join("list-add.svg")))
+            QtGui.QIcon.fromTheme("add", QtGui.QIcon(os.path.join(icon_path, "list-add.svg")))
         )
         self.widget.removeButton.setIcon(
-            QtGui.QIcon.fromTheme("remove", QtGui.QIcon(os.path.join("list-remove.svg")))
+            QtGui.QIcon.fromTheme("remove", QtGui.QIcon(os.path.join(icon_path, "list-remove.svg")))
         )
 
         self.widget.addButton.clicked.connect(self._add_clicked)

addonmanager_installer_gui.py

@@ -634,7 +634,7 @@ def _ask_for_toolbar(self, custom_toolbars):
         toolbar = self.toolbar_adapter.get_toolbar_with_name(custom_toolbar_name)
         if not toolbar:
             # They told us not to ask, but then the toolbar got deleted... ask anyway!
-            ask = fci.Preferences().rem("alwaysAskForToolbar")
+            fci.Preferences().rem("alwaysAskForToolbar")
             return self._ask_for_toolbar(custom_toolbars)
         return toolbar