Merge pull request #164 from luxedo/ENH/156

Enh/156 - Distinguish lists of arrays from tuples of arrays

Author: ev-br

scipy_doctest/impl.py

@@ -323,6 +323,12 @@ def check_output(self, want, got, optionflags):
             else:
                 return self.check_output(want_again, got_again, optionflags)
 
+        # Validate data type if list or tuple
+        is_list_or_tuple = (isinstance(a_want, (list, tuple)) and
+                            isinstance(a_got, (list, tuple)))
+        if is_list_or_tuple and type(a_want) is not type(a_got):
+            return False
+
         # ... and defer to numpy
         try:
             return self._do_check(a_want, a_got)

scipy_doctest/tests/failure_cases.py

@@ -1,4 +1,5 @@
-__all__ = ['func9', 'func10', 'iterable_length_1', 'iterable_length_2']
+__all__ = ['func9', 'func10', 'iterable_length_1', 'iterable_length_2',
+           'tuple_and_list_1', 'tuple_and_list_2']
 
 
 def func9():
@@ -30,3 +31,17 @@ def iterable_length_2():
     >>> [1, 2, 3]
     [1, 2]
     """
+
+
+def tuple_and_list_1():
+    """
+    >>> [0, 1, 2]
+    (0, 1, 2)
+    """
+
+
+def tuple_and_list_2():
+    """
+    >>> (0, 1, 2)
+    [0, 1, 2]
+    """

scipy_doctest/tests/module_cases.py

@@ -190,3 +190,19 @@ def test_cmplx_nan():
     >>> 1j*np.complex128(np.nan)
     np.complex128(nan+nanj)
     """
+
+
+def array_and_list_1():
+    """
+    >>> import numpy as np
+    >>> np.array([1, 2, 3])
+    [1, 2, 3]
+    """
+
+
+def array_and_list_2():
+    """
+    >>> import numpy as np
+    >>> [1, 2, 3]
+    array([1, 2, 3])
+    """

scipy_doctest/tests/test_testmod.py

@@ -108,6 +108,15 @@ def test_wrong_lengths():
     assert res.failed == 2
 
 
+def test_tuple_and_list():
+    config = DTConfig()
+    res, _ = _testmod(failure_cases,
+                      strategy=[failure_cases.tuple_and_list_1,
+                                failure_cases.tuple_and_list_2],
+                      config=config)
+    assert res.failed == 2
+
+
 class TestLocalFiles:
     def test_local_files(self):
         # A doctest tries to open a local file. Test that it works