[Fix] Make imports pointing directly to files

Author: johmedr

spm/__wrapper__/Array.py

@@ -178,8 +178,8 @@ def from_cell(cls, other, **kwargs) -> "Array":
         array : Array
             Converted array.
         """
-        from .. import Cell # FIXME: avoid circular import
-        
+        from .cell import Cell # FIXME: avoid circular import
+
         if not isinstance(other, Cell):
             raise TypeError(f"Expected a {Cell} but got a {type(other)}")
         order = kwargs.get("order", None)

spm/__wrapper__/Runtime.py

@@ -2,9 +2,6 @@
 from .utils import _import_matlab
 
 
-# ----------------------------------------------------------------------
-# Runtime
-# ----------------------------------------------------------------------
 class Runtime:
     """Namespace that holds the matlab runtime. All methods are static."""
 

spm/__wrapper__/Struct.py

@@ -271,7 +271,7 @@ def from_any(cls, other, **kwargs) -> "Struct":
     @classmethod
     def from_cell(cls, other, **kwargs) -> "Struct":
         """See `from_any`."""
-        from . import Cell
+        from .cell import Cell
         if not isinstance(other, Cell):
             raise TypeError(f"Expected a {Cell} but got a {type(other)}.")
         return cls.from_any(other, **kwargs)
@@ -352,7 +352,7 @@ def as_dict(self, keys=None) -> dict:
                 for key in keys:
                     asdict[key].append(item[key])
 
-        from . import Cell
+        from .cell import Cell
         for key in keys:
             asdict[key] = Cell.from_any(asdict[key])
 

spm/__wrapper__/__init__.py

@@ -5,10 +5,6 @@
 from .array import Array
 from .sparse_array import SparseArray
 from .runtime import Runtime
-from . import utils
-from . import core
-from . import helpers
-
 
 # ----------------------------------------------------------------------
 # Questions

spm/__wrapper__/core/base_types.py

@@ -20,14 +20,12 @@ def from_any(cls, other, **kwargs):
         from .delayed_types import AnyDelayedArray
 
          # FIXME: Circular import
-        from .. import (
-            Cell,
-            Array, 
-            MatlabFunction,
-            MatlabClass,
-            Struct,
-            SparseArray,
-        )
+        from ..cell import Cell
+        from ..array import Array
+        from ..matlab_function import MatlabFunction
+        from ..matlab_class import MatlabClass
+        from ..struct import Struct
+        from ..sparse_array import SparseArray
 
         # Conversion rules:
         # - we do not convert to matlab's own array types

spm/__wrapper__/core/delayed_types.py

@@ -193,7 +193,7 @@ def as_num(self) -> "DelayedArray":
         return self._future
 
     def as_obj(self, obj):
-        from .. import MatlabClass
+        from ..matlab_class import MatlabClass
         if (
             self._future is not None and
             not isinstance(self._future, MatlabClass)
@@ -216,12 +216,10 @@ def __getattr__(self, key):
         return self.as_struct[key]
 
     def __setitem__(self, index, value):
-        from .. import (
-            MatlabClass, 
-            Cell, 
-            Array,
-            Struct
-        )
+        from ..matlab_class import MatlabClass
+        from ..cell import Cell
+        from ..struct import Struct
+        from ..array import Array
 
         if isinstance(index, str):
             arr = self.as_struct
@@ -317,7 +315,7 @@ def __init__(self, shape, parent, *index):
         *index : int | str
             Index of the future object in its parent.
         """
-        from .. import Struct
+        from ..struct import Struct
         future = Struct.from_shape(shape)
         future._delayed_wrapper = self
         super().__init__(future, parent, *index)
@@ -341,7 +339,7 @@ def __init__(self, shape, parent, *index):
         *index : int | str
             Index of the future object in its parent.
         """
-        from .. import Cell
+        from ..cell import Cell
         future = Cell.from_shape(shape)
         future._delayed_wrapper = self
         super().__init__(future, parent, *index)
@@ -375,7 +373,7 @@ def __init__(self, shape, parent, *index):
         *index : int | str
             Index of the future object in its parent.
         """
-        from .. import Array
+        from ..array import Array
         future = Array.from_shape(shape)
         future._delayed_wrapper = self
         super().__init__(future, parent, *index)

spm/__wrapper__/core/mixin_types.py

@@ -12,10 +12,6 @@
     ItemsView
 )
 
-from typing import TYPE_CHECKING
-if TYPE_CHECKING:
-    from .. import Struct, Cell
-
 class _ListishMixin:
     """These methods are implemented in Cell and Array, but not Struct."""
 
@@ -572,11 +568,11 @@ class deal: # FIXME: Removed dependency to Cell
         def __new__(cls, arg, **kwargs):
             return cls.from_any(arg, **kwargs)
 
-        def broadcast_to_struct(self, struct: "Struct") -> "Struct":
+        def broadcast_to_struct(self, struct):
             shape = struct.shape + self.shape[len(struct.shape):]
             return np.broadcast_to(self, shape)
 
-        def to_cell(self) -> "Cell":
-            from .. import Cell # FIXME: circular imports
+        def to_cell(self):
+            from ..cell import Cell # FIXME: circular imports
             return np.ndarray.view(self, Cell)
 

spm/__wrapper__/core/wrapped_types.py

@@ -293,7 +293,8 @@ def _resize_for_index(self, index, set_default=True):
                 arr[scalar_index] = scalar
 
     def _return_delayed(self, index):
-        from .. import Cell, Struct # FIXME: avoid circular import
+        from ..cell import Cell
+        from ..struct import Struct # FIXME: avoid circular import
 
         if not isinstance(index, tuple):
             index = (index,)

spm/__wrapper__/matlab_function.py

@@ -1,5 +1,4 @@
 from .core import MatlabType
-from .runtime import Runtime
 from .utils import _import_matlab
 
 class MatlabFunction(MatlabType):
@@ -37,4 +36,5 @@ def from_any(cls, other):
         return cls._from_runtime(other)
 
     def __call__(self, *args, **kwargs):
+        from .runtime import Runtime
         return Runtime.call(self._matlab_object, *args, **kwargs)

spm/__wrapper__/utils.py

@@ -72,5 +72,5 @@ def _matlab_array_types():
 
 def _empty_array():
     """Matlab's default cell/struct elements are 0x0 arrays."""
-    from . import Array
+    from .array import Array
     return Array.from_shape([0, 0])