ENH: Validate type for list or tuple exclusively

Author: luxedo

scipy_doctest/impl.py

@@ -324,7 +324,7 @@ def check_output(self, want, got, optionflags):
                 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)) or
+        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

scipy_doctest/tests/failure_cases.py

@@ -1,5 +1,5 @@
 __all__ = ['func9', 'func10', 'iterable_length_1', 'iterable_length_2',
-           'different_iteralbes_1', 'different_iteralbes_2']
+           'tuple_and_list_1', 'tuple_and_list_2']
 
 
 def func9():
@@ -33,16 +33,15 @@ def iterable_length_2():
     """
 
 
-def different_iteralbes_1():
+def tuple_and_list_1():
     """
     >>> [0, 1, 2]
     (0, 1, 2)
     """
 
 
-def different_iteralbes_2():
+def tuple_and_list_2():
     """
-    >>> import numpy as np
-    >>> np.array([0, 1, 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,11 +108,11 @@ def test_wrong_lengths():
     assert res.failed == 2
 
 
-def test_different_iterables():
+def test_tuple_and_list():
     config = DTConfig()
     res, _ = _testmod(failure_cases,
-                      strategy=[failure_cases.different_iteralbes_1,
-                                failure_cases.different_iteralbes_2],
+                      strategy=[failure_cases.tuple_and_list_1,
+                                failure_cases.tuple_and_list_2],
                       config=config)
     assert res.failed == 2