Merge pull request #91 from chennes/removeUnusedImport

Simplify __del__ methods and add explicit option

Author: chennes

addonmanager_freecad_interface.py

@@ -264,14 +264,19 @@ def __init__(self):
     def __del__(self):
         self.reference_count -= 1
         if not FreeCAD and self.reference_count <= 0:
-            paths = [self.data_dir, self.mod_dir, self.cache_dir, self.macro_dir, self.mod_dir]
-            for path in paths:
-                if os.path.isdir(path):
-                    os.rmdir(path)
-            self.data_dir = None
-            self.mod_dir = None
-            self.cache_dir = None
-            self.macro_dir = None
+            self._delete_paths()
+
+    def _delete_paths(self):
+        if FreeCAD:
+            return
+        paths = [self.data_dir, self.mod_dir, self.cache_dir, self.macro_dir, self.mod_dir]
+        for path in paths:
+            if os.path.isdir(path):
+                os.rmdir(path)
+        self.data_dir = None
+        self.mod_dir = None
+        self.cache_dir = None
+        self.macro_dir = None
 
 
 class Preferences:

addonmanager_installer_gui.py

@@ -536,6 +536,9 @@ def __init__(self, addon):
         self.macro_dir = fci.DataPaths().macro_dir
 
     def __del__(self):
+        quit()
+
+    def quit(self):
         if self.worker_thread and hasattr(self.worker_thread, "quit"):
             self.worker_thread.quit()
             self.worker_thread.wait(500)