Merge pull request #87 from chennes/cleanupImportFrom

Clean up import and import from conflicts

Author: chennes

Addon.py

@@ -34,7 +34,6 @@
 import addonmanager_freecad_interface as fci
 from addonmanager_macro import Macro
 import addonmanager_utilities as utils
-from addonmanager_utilities import construct_git_url, process_date_string_to_python_datetime
 from addonmanager_metadata import (
     Metadata,
     MetadataReader,
@@ -189,7 +188,7 @@ def __init__(
         self._clean_url()
 
         if utils.recognized_git_location(self):
-            self.metadata_url = construct_git_url(self, "package.xml")
+            self.metadata_url = utils.construct_git_url(self, "package.xml")
         else:
             self.metadata_url = None
         self.metadata: Optional[Metadata] = None
@@ -258,7 +257,7 @@ def update_date(self):
             elif self.macro and self.macro.date:
                 # Try to parse the date:
                 try:
-                    self._cached_update_date = process_date_string_to_python_datetime(
+                    self._cached_update_date = utils.process_date_string_to_python_datetime(
                         self.macro.date
                     )
                 except ValueError as e:

AddonManagerTest/app/test_addoncatalog.py

@@ -1,19 +1,18 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-# pylint: disable=global-at-module-level,global-statement,import-outside-toplevel,
+# pylint: import-outside-toplevel,
 
 """Tests for the AddonCatalog and AddonCatalogEntry classes."""
 
-import unittest
-from unittest import mock
+from unittest import mock, main, TestCase
 from unittest.mock import patch
 
 AddonCatalogEntry = None
 AddonCatalog = None
 Version = None
 
 
-class TestAddonCatalogEntry(unittest.TestCase):
+class TestAddonCatalogEntry(TestCase):
     """Tests for the AddonCatalogEntry class."""
 
     def setUp(self):
@@ -89,7 +88,7 @@ def test_version_match_with_min_and_max_bad_match_low(self):
             self.assertFalse(ac.is_compatible())
 
 
-class TestAddonCatalog(unittest.TestCase):
+class TestAddonCatalog(TestCase):
     """Tests for the AddonCatalog class."""
 
     def setUp(self):
@@ -226,3 +225,7 @@ def test_documentation_not_added(self):
         self.assertNotIn("_meta", ids)
         self.assertNotIn("$schema", ids)
         self.assertIn("AnAddon", ids)
+
+
+if __name__ == "__main__":
+    main()

AddonManagerTest/app/test_cache.py

@@ -20,10 +20,8 @@
 # *   <https://www.gnu.org/licenses/>.                                      *
 # *                                                                         *
 # ***************************************************************************
-import datetime
-import unittest
-from datetime import date
-from unittest import TestCase
+from datetime import date, timedelta
+from unittest import TestCase, main
 from unittest.mock import MagicMock, patch
 
 import addonmanager_cache as cache
@@ -45,7 +43,7 @@ def test_local_cache_needs_update(self, param_mock: MagicMock, cache_mock: Magic
             "CustomRepositories": "",
         }
         today = date.today().isoformat()
-        yesterday = (date.today() - datetime.timedelta(1)).isoformat()
+        yesterday = (date.today() - timedelta(1)).isoformat()
 
         # Organize these as subtests because of all the patching that has to be done: once we are in this function,
         # the patch is complete, and we can just modify the return values of the fakes one by one
@@ -120,4 +118,4 @@ def test_local_cache_needs_update(self, param_mock: MagicMock, cache_mock: Magic
 
 
 if __name__ == "__main__":
-    unittest.main()
+    main()

AddonManagerTest/gui/test_python_deps_gui.py

@@ -36,7 +36,7 @@ def test_show(self, patched_create_list_from_pip):
 
 class TestPythonDepsStandaloneFunctions(unittest.TestCase):
 
-    @patch("addonmanager_python_deps_gui.utils.run_interruptable_subprocess")
+    @patch("addonmanager_python_deps_gui.run_interruptable_subprocess")
     def test_call_pip(self, mock_run_subprocess: MagicMock):
         mock_run_subprocess.return_value = MagicMock()
         mock_run_subprocess.return_value.returncode = 0
@@ -45,21 +45,21 @@ def test_call_pip(self, mock_run_subprocess: MagicMock):
         args = mock_run_subprocess.call_args[0][0]
         self.assertIn("pip", args)
 
-    @patch("addonmanager_python_deps_gui.utils.fci.get_python_exe")
+    @patch("addonmanager_python_deps_gui.fci.get_python_exe")
     def test_call_pip_no_python(self, mock_get_python_exe: MagicMock):
         mock_get_python_exe.return_value = None
         with self.assertRaises(PipFailed):
             call_pip(["arg1", "arg2", "arg3"])
 
-    @patch("addonmanager_python_deps_gui.utils.run_interruptable_subprocess")
+    @patch("addonmanager_python_deps_gui.run_interruptable_subprocess")
     def test_call_pip_exception_raised(self, mock_run_subprocess: MagicMock):
         mock_run_subprocess.side_effect = subprocess.CalledProcessError(
             -1, "dummy_command", "Fake contents of stdout", "Fake contents of stderr"
         )
         with self.assertRaises(PipFailed):
             call_pip(["arg1", "arg2", "arg3"])
 
-    @patch("addonmanager_python_deps_gui.utils.run_interruptable_subprocess")
+    @patch("addonmanager_python_deps_gui.run_interruptable_subprocess")
     def test_call_pip_splits_results(self, mock_run_subprocess: MagicMock):
         result_mock = MagicMock()
         result_mock.stdout = "\n".join(["Value 1", "Value 2", "Value 3"])

addonmanager_python_deps_gui.py

@@ -33,38 +33,16 @@
 import sys
 from functools import partial
 from typing import Dict, Iterable, List, Tuple, TypedDict
-from addonmanager_utilities import create_pip_call
+from addonmanager_utilities import (
+    create_pip_call,
+    run_interruptable_subprocess,
+    get_pip_target_directory,
+)
 
 import addonmanager_freecad_interface as fci
 
-try:
-    from PySide import QtCore, QtGui, QtWidgets
-except ImportError:
-    try:
-        from PySide6 import QtCore, QtGui, QtWidgets
-    except ImportError:
-        from PySide2 import QtCore, QtGui, QtWidgets
-
-# Make sure this can run inside and outside FreeCAD, and don't require that (when run inside FreeCAD) the user has the
-# python QtUiTools installed, because FreeCAD wraps it for us.
-try:
-    import FreeCADGui
-
-    loadUi = FreeCADGui.PySideUic.loadUi
-except ImportError:
-    try:
-        from PySide6.QtUiTools import QUiLoader
-    except ImportError:
-        from PySide2.QtUiTools import QUiLoader
-
-    def loadUi(ui_file: str) -> QtWidgets.QWidget:
-        q_ui_file = QtCore.QFile(ui_file)
-        q_ui_file.open(QtCore.QFile.OpenModeFlag.ReadOnly)
-        loader = QUiLoader()
-        return loader.load(ui_file)
-
+from PySideWrapper import QtCore, QtGui, QtWidgets
 
-import addonmanager_utilities as utils
 
 translate = fci.translate
 
@@ -123,7 +101,7 @@ def call_pip(args: List[str]) -> List[str]:
         raise PipFailed() from exception
 
     try:
-        proc = utils.run_interruptable_subprocess(call_args)
+        proc = run_interruptable_subprocess(call_args)
     except subprocess.CalledProcessError as exception:
         raise PipFailed("pip timed out") from exception
 
@@ -215,12 +193,12 @@ class DependentAddon(TypedDict):
         optional: bool
 
     def __init__(self, addons):
-        self.dlg = loadUi(
+        self.dlg = fci.loadUi(
             os.path.join(os.path.dirname(__file__), "PythonDependencyUpdateDialog.ui")
         )
 
         self.addons = addons
-        self.vendor_path = utils.get_pip_target_directory()
+        self.vendor_path = get_pip_target_directory()
         self.worker_thread = None
         self.worker_object = None
         self.package_list = []
@@ -405,7 +383,7 @@ def migrate_old_am_installations(cls) -> bool:
 
         old_directory = os.path.join(fci.DataPaths().data_dir, "AdditionalPythonPackages")
 
-        new_directory = utils.get_pip_target_directory()
+        new_directory = get_pip_target_directory()
         new_directory_name = new_directory.rsplit(os.path.sep, 1)[1]
 
         if not os.path.exists(old_directory) or os.path.exists(