WIP: New MATLAB loader

scipy/io/matlab/byteordercodes.py

@@ -9,14 +9,14 @@
 
 import sys
 
-sys_is_le = sys.byteorder == 'little'
-native_code = sys_is_le and '<' or '>'
-swapped_code = sys_is_le and '>' or '<'
+sys_is_le = sys.byteorder == "little"
+native_code = "<" if sys_is_le else ">"
+swapped_code = ">" if sys_is_le else "<"
 
-aliases = {'little': ('little', '<', 'l', 'le'),
-           'big': ('big', '>', 'b', 'be'),
-           'native': ('native', '='),
-           'swapped': ('swapped', 'S')}
+aliases = {"little": "<", "<": "<", "l": "<", "le": "<",
+           "big": ">", ">": ">", "b": ">", "be": ">",
+           None: native_code, "native": native_code, "=": native_code,
+           "swapped": swapped_code, "s": swapped_code}
 
 
 def to_numpy_code(code):
@@ -54,17 +54,8 @@ def to_numpy_code(code):
     True
 
     """
-    code = code.lower()
-    if code is None:
-        return native_code
-    if code in aliases['little']:
-        return '<'
-    elif code in aliases['big']:
-        return '>'
-    elif code in aliases['native']:
-        return native_code
-    elif code in aliases['swapped']:
-        return swapped_code
-    else:
+    try:
+        return aliases[code.lower() if code else code]
+    except KeyError:
         raise ValueError(
             'We cannot handle byte order %s' % code)

scipy/io/matlab/mio.py

@@ -67,7 +67,8 @@ def mat_reader_factory(file_name, appendmat=True, **kwargs):
 
 
 @docfiller
-def loadmat(file_name, mdict=None, appendmat=True, **kwargs):
+def loadmat(file_name, mdict=None, appendmat=True, variable_names=None,
+            **kwargs):
     """
     Load MATLAB file
 
@@ -130,15 +131,14 @@ def loadmat(file_name, mdict=None, appendmat=True, **kwargs):
     HDF5 / 7.3 interface here.
 
     """
-    variable_names = kwargs.pop('variable_names', None)
     MR = mat_reader_factory(file_name, appendmat, **kwargs)
     matfile_dict = MR.get_variables(variable_names)
     if mdict is not None:
         mdict.update(matfile_dict)
     else:
         mdict = matfile_dict
     if isinstance(file_name, string_types):
-        MR.mat_stream.close()
+        MR.close()
     return mdict
 
 
@@ -247,5 +247,5 @@ def whosmat(file_name, appendmat=True, **kwargs):
     ML = mat_reader_factory(file_name, **kwargs)
     variables = ML.list_variables()
     if isinstance(file_name, string_types):
-        ML.mat_stream.close()
+        ML.close()
     return variables

scipy/io/matlab/mio4.py

@@ -312,6 +312,9 @@ def __init__(self, mat_stream, *args, **kwargs):
         super(MatFile4Reader, self).__init__(mat_stream, *args, **kwargs)
         self._matrix_reader = None
 
+    def close(self):
+        self.mat_stream.close()
+
     def guess_byte_order(self):
         self.mat_stream.seek(0)
         mopt = read_dtype(self.mat_stream, np.dtype('i4'))