renamed the df_aslarray() function to df_asarray()

Author: alixdamman

larray/inout/csv.py

@@ -17,7 +17,7 @@
 from larray.util.misc import skip_comment_cells, strip_rows, csv_open, deprecate_kwarg
 from larray.inout.session import register_file_handler
 from larray.inout.common import _get_index_col, FileHandler
-from larray.inout.pandas import df_aslarray, _axes_to_df, _df_to_axes, _groups_to_df, _df_to_groups
+from larray.inout.pandas import df_asarray, _axes_to_df, _df_to_axes, _groups_to_df, _df_to_groups
 from larray.example import get_example_filepath
 
 
@@ -230,7 +230,7 @@ def read_csv(filepath_or_buffer, nb_axes=None, index_col=None, sep=',', headerse
         df.index.names = combined_axes_names.split(headersep)
         raw = False
 
-    return df_aslarray(df, sort_rows=sort_rows, sort_columns=sort_columns, fill_value=fill_value, raw=raw, wide=wide)
+    return df_asarray(df, sort_rows=sort_rows, sort_columns=sort_columns, fill_value=fill_value, raw=raw, wide=wide)
 
 
 def read_tsv(filepath_or_buffer, **kwargs):

larray/inout/excel.py

@@ -19,7 +19,7 @@
 from larray.util.misc import deprecate_kwarg
 from larray.inout.session import register_file_handler
 from larray.inout.common import _get_index_col, FileHandler
-from larray.inout.pandas import df_aslarray, _axes_to_df, _df_to_axes, _groups_to_df, _df_to_groups
+from larray.inout.pandas import df_asarray, _axes_to_df, _df_to_axes, _groups_to_df, _df_to_groups
 from larray.inout.xw_excel import open_excel
 from larray.example import get_example_filepath
 
@@ -220,8 +220,8 @@ def read_excel(filepath, sheet=0, nb_axes=None, index_col=None, fill_value=nan,
     else:
         # TODO: add support for range argument (using usecols, skiprows and nrows arguments of pandas.read_excel)
         df = pd.read_excel(filepath, sheet, index_col=index_col, engine=engine, **kwargs)
-        return df_aslarray(df, sort_rows=sort_rows, sort_columns=sort_columns, raw=index_col is None,
-                           fill_value=fill_value, wide=wide)
+        return df_asarray(df, sort_rows=sort_rows, sort_columns=sort_columns, raw=index_col is None,
+                          fill_value=fill_value, wide=wide)
 
 
 @register_file_handler('pandas_excel', ['xls', 'xlsx'] if xw is None else None)
@@ -282,7 +282,7 @@ def list_items(self):
     def _read_item(self, key, type, *args, **kwargs):
         if type == 'Array':
             df = self.handle.parse(key, *args, **kwargs)
-            return df_aslarray(df, raw=True)
+            return df_asarray(df, raw=True)
         elif type == 'Axis':
             return self.axes[key]
         elif type == 'Group':

larray/inout/hdf.py

@@ -13,7 +13,7 @@
 from larray.util.misc import LHDFStore
 from larray.inout.session import register_file_handler
 from larray.inout.common import FileHandler
-from larray.inout.pandas import df_aslarray
+from larray.inout.pandas import df_asarray
 from larray.example import get_example_filepath
 
 
@@ -79,8 +79,8 @@ def read_hdf(filepath_or_buffer, key, fill_value=nan, na=nan, sort_rows=False, s
         if _type in ['Array', 'LArray']:
             # cartesian product is not necessary if the array was written by LArray
             cartesian_prod = writer != 'LArray'
-            res = df_aslarray(pd_obj, sort_rows=sort_rows, sort_columns=sort_columns, fill_value=fill_value,
-                              parse_header=False, cartesian_prod=cartesian_prod)
+            res = df_asarray(pd_obj, sort_rows=sort_rows, sort_columns=sort_columns, fill_value=fill_value,
+                             parse_header=False, cartesian_prod=cartesian_prod)
             if _meta is not None:
                 res.meta = _meta
         elif _type == 'Axis':

larray/inout/misc.py

@@ -6,7 +6,7 @@
 from larray.core.constants import nan
 from larray.util.misc import StringIO, deprecate_kwarg
 from larray.inout.common import _get_index_col
-from larray.inout.pandas import df_aslarray
+from larray.inout.pandas import df_asarray
 from larray.inout.csv import read_csv
 
 
@@ -114,8 +114,8 @@ def from_lists(data, nb_axes=None, index_col=None, fill_value=nan, sort_rows=Fal
     if index_col is not None:
         df.set_index([df.columns[c] for c in index_col], inplace=True)
 
-    return df_aslarray(df, raw=index_col is None, parse_header=False, sort_rows=sort_rows, sort_columns=sort_columns,
-                       fill_value=fill_value, wide=wide)
+    return df_asarray(df, raw=index_col is None, parse_header=False, sort_rows=sort_rows, sort_columns=sort_columns,
+                      fill_value=fill_value, wide=wide)
 
 
 @deprecate_kwarg('nb_index', 'nb_axes', arg_converter=lambda x: x + 1)

larray/inout/pandas.py

@@ -252,8 +252,8 @@ def from_frame(df, sort_rows=False, sort_columns=False, parse_header=False, unfo
     return Array(data, axes, meta=meta)
 
 
-def df_aslarray(df, sort_rows=False, sort_columns=False, raw=False, parse_header=True, wide=True, cartesian_prod=True,
-                **kwargs):
+def df_asarray(df, sort_rows=False, sort_columns=False, raw=False, parse_header=True, wide=True, cartesian_prod=True,
+               **kwargs):
     r"""
     Prepare Pandas DataFrame and then convert it into Array.
 
@@ -289,7 +289,7 @@ def df_aslarray(df, sort_rows=False, sort_columns=False, raw=False, parse_header
     -------
     Array
     """
-    # we could inline df_aslarray into the functions that use it, so that the original (non-cartesian) df is freed from
+    # we could inline df_asarray into the functions that use it, so that the original (non-cartesian) df is freed from
     # memory at this point, but it would be much uglier and would not lower the peak memory usage which happens during
     # cartesian_product_df.reindex
 

larray/inout/sas.py

@@ -6,7 +6,7 @@
 import pandas as pd
 
 from larray.core.constants import nan
-from larray.inout.pandas import df_aslarray
+from larray.inout.pandas import df_asarray
 from larray.util.misc import deprecate_kwarg
 
 
@@ -32,4 +32,4 @@ def read_sas(filepath, nb_axes=None, index_col=None, fill_value=nan, na=nan, sor
         index_col = [index_col]
 
     df = pd.read_sas(filepath, index=index_col, **kwargs)
-    return df_aslarray(df, sort_rows=sort_rows, sort_columns=sort_columns, fill_value=fill_value)
+    return df_asarray(df, sort_rows=sort_rows, sort_columns=sort_columns, fill_value=fill_value)

larray/inout/xw_excel.py

@@ -14,7 +14,7 @@
 from larray.core.axis import Axis
 from larray.core.constants import nan
 from larray.core.group import _translate_sheet_name
-from larray.inout.pandas import df_aslarray
+from larray.inout.pandas import df_asarray
 from larray.inout.misc import from_lists
 from larray.util.misc import PY2, deprecate_kwarg
 
@@ -56,7 +56,7 @@ class ArrayConverter(PandasDataFrameConverter):
         @classmethod
         def read_value(cls, value, options):
             df = PandasDataFrameConverter.read_value(value, options)
-            return df_aslarray(df)
+            return df_asarray(df)
 
         @classmethod
         def write_value(cls, value, options):