Skip to content

Commit 20159c1

Browse files
author
Joshua Bradt
committed
Changed exception classes to ValueError.
1 parent 129d531 commit 20159c1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pandas/core/reshape.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -765,8 +765,8 @@ def melt(frame, id_vars=None, value_vars=None, var_name=None,
765765
id_vars = [id_vars]
766766
elif (isinstance(frame.columns, MultiIndex) and
767767
not isinstance(id_vars, list)):
768-
raise TypeError('id_vars must be a list of tuples when columns'
769-
' are a MultiIndex')
768+
raise ValueError('id_vars must be a list of tuples when columns'
769+
' are a MultiIndex')
770770
else:
771771
id_vars = list(id_vars)
772772
else:
@@ -777,8 +777,8 @@ def melt(frame, id_vars=None, value_vars=None, var_name=None,
777777
value_vars = [value_vars]
778778
elif (isinstance(frame.columns, MultiIndex) and
779779
not isinstance(value_vars, list)):
780-
raise TypeError('value_vars must be a list of tuples when'
781-
' columns are a MultiIndex')
780+
raise ValueError('value_vars must be a list of tuples when'
781+
' columns are a MultiIndex')
782782
else:
783783
value_vars = list(value_vars)
784784
frame = frame.loc[:, id_vars + value_vars]

pandas/tests/test_reshape.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def test_id_and_value_vars_types_with_multiindex(self):
8585
value_vars=value_vars)
8686
tm.assert_frame_equal(result, expected)
8787
else:
88-
with self.assertRaisesRegex(TypeError, r'MultiIndex'):
88+
with self.assertRaisesRegex(ValueError, r'MultiIndex'):
8989
melt(self.df1, id_vars=id_vars, value_vars=value_vars)
9090

9191
def test_custom_var_name(self):

0 commit comments

Comments
 (0)