(issue 805): anonymous and/or wildcard axes are handled correctly when using Session.save() and Session.load()

Author: alixdamman

larray/inout/pandas.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import, print_function
 
+import re
 from itertools import product
 from collections import OrderedDict
 
@@ -140,6 +141,9 @@ def from_series(s, sort_rows=False, fill_value=nan, meta=None, **kwargs):
         return LArray(s.values, Axis(s.index.values, name), meta=meta)
 
 
+_anonymous_axis_pattern = re.compile(r'\{(\d+|\??)\}\*?')
+
+
 def from_frame(df, sort_rows=False, sort_columns=False, parse_header=False, unfold_last_axis_name=False,
                fill_value=nan, meta=None, cartesian_prod=True, **kwargs):
     r"""
@@ -339,19 +343,24 @@ def df_aslarray(df, sort_rows=False, sort_columns=False, raw=False, parse_header
 # #################################### #
 
 def _axis_to_series(key, axis, dtype=None):
-    name = '{}:{}'.format(key, axis.name)
-    return pd.Series(data=axis.labels, name=name, dtype=dtype)
+    name = '{}:{}'.format(key, str(axis))
+    labels = len(axis) if axis.iswildcard else axis.labels
+    return pd.Series(data=labels, name=name, dtype=dtype)
 
 
 def _series_to_axis(series):
     name = str(series.name)
     series = series.loc[:series.last_valid_index()]
     if ':' in name:
         key, axis_name = name.split(':')
+        labels = int(series.values[0]) if axis_name[-1] == '*' else series.values
+        if _anonymous_axis_pattern.fullmatch(axis_name):
+            axis_name = None
     else:
         # for backward compatibility
         key = axis_name = name
-    return key, Axis(labels=series.values, name=axis_name)
+        labels = series.values
+    return key, Axis(labels=labels, name=axis_name)
 
 
 def _group_to_series(key, group, dtype=None):