merge master

Author: charlesdong1991

pandas/core/sparse/frame.py

@@ -432,8 +432,8 @@ def sp_maker(x, index=None):
 
  elif isinstance(value, SparseArray):
  if len(value) != len(self.index):
- raise AssertionError('Length of values does not match '
-  'length of index')
+ raise ValueError('Length of values does not match '
+ 'length of index')
  clean = value
 
  elif hasattr(value, '__iter__'):
@@ -443,8 +443,8 @@ def sp_maker(x, index=None):
  clean = sp_maker(clean)
  else:
  if len(value) != len(self.index):
- raise AssertionError('Length of values does not match '
-  'length of index')
+ raise ValueError('Length of values does not match '
+ 'length of index')
  clean = sp_maker(value)
 
  # Scalar

pandas/tests/sparse/frame/test_frame.py

@@ -568,8 +568,9 @@ def _check_frame(frame, orig):
  assert len(frame['I'].sp_values) == N // 2
 
  # insert ndarray wrong size
- msg = "Length of values does not match length of index"
- with pytest.raises(AssertionError, match=msg):
+ # GH 25484
+ msg = 'Length of values does not match length of index'
+ with pytest.raises(ValueError, match=msg):
  frame['foo'] = np.random.randn(N - 1)
 
  # scalar value