[Enh] Change file names for PEP-8

Author: johmedr

spm/__wrapper__/Array.py

@@ -178,7 +178,8 @@ def from_cell(cls, other, **kwargs) -> "Array":
         array : Array
             Converted array.
         """
-        from .Cell import Cell # FIXME: avoid circular import
+        from .. 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

@@ -60,6 +60,7 @@ def _import_initialize():
             # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             print(Runtime._help)
             raise e
+        
         # Make sure matlab is imported
         _import_matlab()
 

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 .Cell import Cell
+        from . 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 .Cell import Cell
+        from . import Cell
         for key in keys:
             asdict[key] = Cell.from_any(asdict[key])
 

spm/__wrapper__/__init__.py

@@ -1,12 +1,13 @@
 from . import utils
 from . import core
-from .Runtime import Runtime
-from .MatlabClass import MatlabClass
-from .MatlabFunction import MatlabFunction
-from .Cell import Cell
-from .Struct import Struct
-from .Array import Array
-from .SparseArray import SparseArray
+from . import helpers
+from .runtime import Runtime
+from .matlab_class import MatlabClass
+from .matlab_function import MatlabFunction
+from .cell import Cell
+from .struct import Struct
+from .array import Array
+from .sparse_array import SparseArray
 
 
 # ----------------------------------------------------------------------

spm/__wrapper__/core/delayed_types.py

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

spm/__wrapper__/core/mixin_types.py

@@ -14,8 +14,7 @@
 
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
-    from .Struct import Struct
-    from .Cell import Cell
+    from .. import Struct, Cell
 
 class _ListishMixin:
     """These methods are implemented in Cell and Array, but not Struct."""
@@ -451,7 +450,7 @@ def __getitem__(self, key):
 
             parent = getattr(self, "_delayed_wrapper", self)
 
-            from ..Struct import Struct # FIXME: circular imports
+            from ..struct import Struct # FIXME: circular imports
             delayed = Struct(self.shape)
             opt = dict(
                 flags=['refs_ok', 'zerosize_ok', 'multi_index'],
@@ -532,7 +531,7 @@ def setdefault(self, key, value=None):
                 item.setdefault(key, value)
 
     def update(self, other):
-        from ..Struct import Struct # FIXME: circular imports
+        from ..struct import Struct # FIXME: circular imports
         other = Struct.from_any(other)
         other = np.ndarray.view(other, np.ndarray)
         other = np.broadcast_to(other, self.shape)
@@ -578,6 +577,6 @@ def broadcast_to_struct(self, struct: "Struct") -> "Struct":
             return np.broadcast_to(self, shape)
 
         def to_cell(self) -> "Cell":
-            from ..Cell import Cell # FIXME: circular imports
+            from .. import Cell # FIXME: circular imports
             return np.ndarray.view(self, Cell)
 

spm/__wrapper__/core/wrapped_types.py

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

spm/__wrapper__/MatlabClass.py spm/__wrapper__/matlab_class.pyspm/__wrapper__/MatlabClass.py renamed to spm/__wrapper__/matlab_class.py

@@ -1,4 +1,5 @@
 from .core import MatlabType
+from .runtime import Runtime
 
 import numpy as np
 import warnings
@@ -7,7 +8,6 @@ class MatlabClass(MatlabType):
     _subclasses = dict()
 
     def __new__(cls, *args, _objdict=None, **kwargs):
-        from .Runtime import Runtime
 
         if _objdict is None:
             if cls.__name__ in MatlabClass._subclasses.keys():
@@ -88,6 +88,7 @@ def __call(self, *index):
             raise IndexError(index)
 
     def _process_index(self, ind, k=1, n=1):
+        # FIXME: This should not need to call matlab
         try:
             return tuple(
                 self._process_index(i, k+1, len(ind))
@@ -96,8 +97,6 @@ def _process_index(self, ind, k=1, n=1):
         except TypeError:
             pass
 
-        from .Runtime import Runtime 
-
         if not hasattr(self, '__endfn'):
             self.__endfn = Runtime.call('str2func', 'end')
 

spm/__wrapper__/MatlabFunction.py spm/__wrapper__/matlab_function.pyspm/__wrapper__/MatlabFunction.py renamed to spm/__wrapper__/matlab_function.py

@@ -1,5 +1,5 @@
 from .core import MatlabType
-from .Runtime import Runtime
+from .runtime import Runtime
 from .utils import _import_matlab
 
 class MatlabFunction(MatlabType):

spm/__wrapper__/SparseArray.py spm/__wrapper__/sparse_array.pyspm/__wrapper__/SparseArray.py renamed to spm/__wrapper__/sparse_array.py

@@ -6,7 +6,7 @@
     _spcopy_if_needed,
     sparse
 )
-from .Array import Array
+from .array import Array
 
 import numpy as np
 import warnings