fix #497: fixed read_csv(sort_columns=True) for 1D arrays

Author: gdementen

doc/source/changes/version_0_26_1.rst.inc

@@ -13,3 +13,5 @@ Fixes
   ambiguous with labels from other axes (closes :issue:`485`).
 
 * fixed reading 1D arrays with non-string labels (closes :issue:`495`).
+
+* fixed read_csv(sort_columns=True) for 1D arrays (closes :issue:`497`).

larray/inout/array.py

@@ -237,7 +237,9 @@ def df_aslarray(df, sort_rows=False, sort_columns=False, raw=False, parse_header
             df.columns = pd.Index([parse(cell) for cell in df.columns.values], name=df.columns.name)
         series = df.iloc[0]
         series.name = df.index.name
-        return from_series(series, sort_rows=sort_rows)
+        if sort_rows:
+            raise ValueError('sort_rows=True is not valid for 1D arrays. Please use sort_columns instead.')
+        return from_series(series, sort_rows=sort_columns)
     else:
         axes_names = [decode(name, 'utf8') for name in df.index.names]
         unfold_last_axis_name = isinstance(axes_names[-1], basestring) and '\\' in axes_names[-1]

larray/tests/test_array.py

@@ -2497,6 +2497,10 @@ def test_read_csv(self):
         res = read_csv(StringIO('a,1,2\n,0,1\n'))
         assert_array_equal(res, ndrange('a=1,2'))
 
+        # sort_columns=True
+        res = read_csv(StringIO('a,a2,a0,a1\n,2,0,1\n'), sort_columns=True)
+        assert_array_equal(res, ndtest(3))
+
     def test_read_eurostat(self):
         la = read_eurostat(abspath('test5d_eurostat.csv'))
         self.assertEqual(la.ndim, 5)