discover(object) sniffs for shape/dtype

blaze · Feb 8, 2015 · 7728533 · 7728533
1 parent bd36240
commit 7728533
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/datashape/discovery.py b/datashape/discovery.py
@@ -45,6 +45,8 @@ def discover(o, **kwargs):
     See http://datashape.pydata.org/grammar.html#some-simple-examples
     for more examples
     """
+    if hasattr(o, 'shape') and hasattr(o, 'dtype'):
+        return from_numpy(o.shape, o.dtype)
     raise NotImplementedError("Don't know how to discover type %s" %
             type(o).__name__)
 

diff --git a/datashape/tests/test_discovery.py b/datashape/tests/test_discovery.py
@@ -265,3 +265,12 @@ def test_letters_only_strings():
                'friday', 'saturday', 'a', 'b', 'now', 'yesterday', 'tonight')
     for s in strings:
         assert discover(s) == string
+
+
+def test_discover_array_like():
+    class MyArray(object):
+        def __init__(self, shape, dtype):
+            self.shape = shape
+            self.dtype = dtype
+
+    assert discover(MyArray((4, 3), 'f4')) == dshape('4 * 3 * float32')