@@ -675,12 +675,14 @@ def test_from_arrays(self):
675
675
# list of arrays as input
676
676
result = MultiIndex .from_arrays (arrays )
677
677
assert list (result ) == list (self .index )
678
+
678
679
# iterator as input
679
680
result2 = MultiIndex .from_arrays (iter (arrays ))
680
681
assert list (result2 ) == list (self .index )
682
+
681
683
# invlide iterator input
682
684
with tm .assert_raises_regex (
683
- TypeError , "Inappropriate input for list of arrays ." ):
685
+ TypeError , "Input must be a list / sequence of array-likes ." ):
684
686
MultiIndex .from_arrays (0 )
685
687
686
688
# infer correctly
@@ -839,9 +841,10 @@ def test_from_product(self):
839
841
result2 = MultiIndex .from_product (iter ([first , second ]), names = names )
840
842
assert result2 .equals (expected )
841
843
assert result2 .names == names
844
+
842
845
# Invalid non-iterable input
843
- with tm .assert_raises_regex (TypeError ,
844
- "Inappropriate input for iterables." ):
846
+ with tm .assert_raises_regex (
847
+ TypeError , "Input must be a list / sequence of iterables." ):
845
848
MultiIndex .from_product (0 )
846
849
847
850
def test_from_product_empty (self ):
@@ -1745,17 +1748,20 @@ def test_from_tuples(self):
1745
1748
expected = MultiIndex (levels = [[1 , 3 ], [2 , 4 ]],
1746
1749
labels = [[0 , 1 ], [0 , 1 ]],
1747
1750
names = ['a' , 'b' ])
1751
+
1748
1752
# input tuples
1749
1753
res1 = MultiIndex .from_tuples (((1 , 2 ), (3 , 4 )), names = ['a' , 'b' ])
1750
1754
assert expected .names == res1 .names
1751
1755
assert res1 .equals (expected )
1756
+
1752
1757
# input iterator for tuples
1753
1758
res2 = MultiIndex .from_tuples (zip ([1 , 3 ], [2 , 4 ]), names = ['a' , 'b' ])
1754
1759
assert expected .names == res2 .names
1755
1760
assert res2 .equals (expected )
1761
+
1756
1762
# input non-iterables
1757
- with tm .assert_raises_regex (TypeError ,
1758
- 'Inappropriate input for tuples .' ):
1763
+ with tm .assert_raises_regex (
1764
+ TypeError , 'Input must be a list /sequence of tuple-likes .' ):
1759
1765
MultiIndex .from_tuples (0 )
1760
1766
1761
1767
def test_from_tuples_empty (self ):
0 commit comments