Fixed range handling of OSU dtypes

holoviz · Feb 18, 2018 · bf5ea1b · bf5ea1b
1 parent d8a4da3
commit bf5ea1b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/holoviews/core/data/interface.py b/holoviews/core/data/interface.py
@@ -281,14 +281,16 @@ def indexed(cls, dataset, selection):
     @classmethod
     def range(cls, dataset, dimension):
         column = dataset.dimension_values(dimension)
+        print(column)
         if column.dtype.kind == 'M':
             return column.min(), column.max()
         elif len(column) == 0:
             return np.NaN, np.NaN
         else:
             try:
+                assert column.dtype.kind not in 'SUO'
                 return (np.nanmin(column), np.nanmax(column))
-            except TypeError:
+            except (AssertionError, TypeError):
                 column = [v for v in util.python2sort(column) if v is not None]
                 if not len(column):
                     return np.NaN, np.NaN

diff --git a/holoviews/core/data/pandas.py b/holoviews/core/data/pandas.py
@@ -294,16 +294,6 @@ def dframe(cls, columns, dimensions):
             return columns.data.copy()
 
 
-    @classmethod
-    def array(cls, dataset, dimensions):
-        if not dimensions:
-            dimensions = dataset.dimensions(label='name')
-        else:
-            dimensions = [dataset.get_dimensions(d).name for d in dimensions]
-        inds = [dataset.data.columns.index(dim.name) for dim in dimensions]
-        return dataset.data.values[:, inds]
-
-
     @classmethod
     def iloc(cls, dataset, index):
         rows, cols = index