Merge pull request #21961 from knipknap/tool-cleanups

CAM: Some cleanups (moving DetachedDocumentObject around)

src/Mod/CAM/Path/Tool/docobject/__init__.py

@@ -0,0 +1,3 @@
+from .models.docobject import DetachedDocumentObject
+
+__all__ = ["DetachedDocumentObject"]

src/Mod/CAM/Path/Tool/docobject/ui/__init__.py

@@ -0,0 +1,3 @@
+from .docobject import DocumentObjectEditorWidget
+
+__all__ = ["DocumentObjectEditorWidget"]

src/Mod/CAM/Path/Tool/toolbit/models/base.py

@@ -33,10 +33,10 @@ from lazy_loader.lazy_loader import LazyLoader
 from typing import Any, List, Optional, Tuple, Type, Union, Mapping, cast
 from PySide.QtCore import QT_TRANSLATE_NOOP
 from Path.Base.Generator import toolchange
-from ...assets import Asset
+from ...docobject import DetachedDocumentObject
+from ...assets.asset import Asset
 from ...camassets import cam_assets
 from ...shape import ToolBitShape, ToolBitShapeCustom, ToolBitShapeIcon
-from ..docobject import DetachedDocumentObject
 from ..util import to_json, format_value
 
 

src/Mod/CAM/Path/Tool/toolbit/ui/editor.py

@@ -22,13 +22,12 @@
 
 """Widget for editing a ToolBit object."""
 
-from functools import partial
 import FreeCAD
 import FreeCADGui
 from PySide import QtGui, QtCore
-from ..models.base import ToolBit
 from ...shape.ui.shapewidget import ShapeWidget
-from ...ui.docobject import DocumentObjectEditorWidget
+from ...docobject.ui import DocumentObjectEditorWidget
+from ..models.base import ToolBit
 
 
 class ToolBitPropertiesWidget(QtGui.QWidget):