>> (820) : modified Array.dump() method so as to dump array with axes.names[-2] = anonymous_axis and axes.names[-1] = axis_name as '\<axis_with_name>' instead of '<axis_with_name>'

Author: alixdamman

larray/core/array.py

@@ -2556,7 +2556,7 @@ def dump(self, header=True, wide=True, value_name='value', light=False, axes_nam
             # transforms ['a', 'b', 'c', 'd'] into ['a', 'b', 'c\\d']
             if wide and len(axes_names) > 1:
                 if dump_axes_names is True:
-                    separator = '\\' if axes_names[-2] and axes_names[-1] else ''
+                    separator = '\\' if axes_names[-1] else ''
                     axes_names[-2] = separator.join(axes_names[-2:])
                     axes_names.pop()
                 elif dump_axes_names == 'except_last':

larray/inout/pandas.py

@@ -226,6 +226,7 @@ def from_frame(df, sort_rows=False, sort_columns=False, parse_header=False, unfo
     if unfold_last_axis_name:
         if isinstance(axes_names[-1], basestring) and '\\' in axes_names[-1]:
             last_axes = [name.strip() for name in axes_names[-1].split('\\')]
+            last_axes = [name if name else None for name in last_axes]
             axes_names = axes_names[:-1] + last_axes
         else:
             axes_names += [None]
@@ -327,8 +328,13 @@ def df_asarray(df, sort_rows=False, sort_columns=False, raw=False, parse_header=
             raise ValueError('sort_rows=True is not valid for 1D arrays. Please use sort_columns instead.')
         res = from_series(series, sort_rows=sort_columns)
     else:
-        axes_names = [decode(name, 'utf8') if isinstance(name, basestring) else name
-                      for name in df.index.names]
+        def parse_axis_name(name):
+            if isinstance(name, basestring):
+                name = decode(name, 'utf8')
+            if not name:
+                name = None
+            return name
+        axes_names = [parse_axis_name(name) for name in df.index.names]
         unfold_last_axis_name = isinstance(axes_names[-1], basestring) and '\\' in axes_names[-1]
         res = from_frame(df, sort_rows=sort_rows, sort_columns=sort_columns, parse_header=parse_header,
                          unfold_last_axis_name=unfold_last_axis_name, cartesian_prod=cartesian_prod, **kwargs)

larray/tests/test_array.py

@@ -4137,7 +4137,7 @@ def test_dump():
     # array with an anonymous axis and a wildcard axis
     arr = ndtest((Axis('a0,a1'), Axis(2, 'b')))
     res = arr.dump()
-    assert res == [['b', 0, 1],
+    assert res == [['\\b', 0, 1],
                    ['a0', 0, 1],
                    ['a1', 2, 3]]
     res = arr.dump(_axes_display_names=True)
@@ -4304,7 +4304,7 @@ def test_open_excel(tmpdir):
         assert_array_equal(res, a3.data.reshape((6, 4)))
 
     # 4) Blank cells
-    # ========================
+    # ==============
     # Excel sheet with blank cells on right/bottom border of the array to read
     fpath = inputpath('test_blank_cells.xlsx')
     with open_excel(fpath) as wb:
@@ -4320,7 +4320,16 @@ def test_open_excel(tmpdir):
     assert_array_equal(bad3, good2)
     assert_array_equal(bad4, good2)
 
-    # 5) crash test
+    # 5) anonymous and wilcard axes
+    # =============================
+    arr = ndtest((Axis('a0,a1'), Axis(2, 'b')))
+    fpath = tmp_path(tmpdir, 'anonymous_and_wildcard_axes.xlsx')
+    with open_excel(fpath, overwrite_file=True) as wb:
+        wb[0] = arr.dump()
+        res = wb[0].load()
+        assert arr.equals(res)
+
+    # 6) crash test
     # =============
     arr = ndtest((2, 2))
     fpath = tmp_path(tmpdir, 'temporary_test_file.xlsx')