Merge remote-tracking branch 'upstream/master' into combine-exception · pandas-dev/pandas@1921c6f (original) (raw)

`@@ -3260,7 +3260,7 @@ def _ensure_valid_index(self, value):

`

3260

3260

`if not len(self.index) and is_list_like(value):

`

3261

3261

`try:

`

3262

3262

`value = Series(value)

`

3263

``

`-

except:

`

``

3263

`+

except (ValueError, NotImplementedError, TypeError):

`

3264

3264

`raise ValueError('Cannot set a frame with no defined index '

`

3265

3265

`'and a value that cannot be converted to a '

`

3266

3266

`'Series')

`

`@@ -3629,7 +3629,8 @@ def align(self, other, join='outer', axis=None, level=None, copy=True,

`

3629

3629

`fill_axis=fill_axis,

`

3630

3630

`broadcast_axis=broadcast_axis)

`

3631

3631

``

3632

``

`-

@Appender(_shared_docs['reindex'] % _shared_doc_kwargs)

`

``

3632

`+

@Substitution(**_shared_doc_kwargs)

`

``

3633

`+

@Appender(NDFrame.reindex.doc)

`

3633

3634

`@rewrite_axis_style_signature('labels', [('method', None),

`

3634

3635

` ('copy', True),

`

3635

3636

` ('level', None),

`

`@@ -4479,7 +4480,8 @@ def f(vals):

`

4479

4480

`# ----------------------------------------------------------------------

`

4480

4481

`# Sorting

`

4481

4482

``

4482

``

`-

@Appender(_shared_docs['sort_values'] % _shared_doc_kwargs)

`

``

4483

`+

@Substitution(**_shared_doc_kwargs)

`

``

4484

`+

@Appender(NDFrame.sort_values.doc)

`

4483

4485

`def sort_values(self, by, axis=0, ascending=True, inplace=False,

`

4484

4486

`kind='quicksort', na_position='last'):

`

4485

4487

`inplace = validate_bool_kwarg(inplace, 'inplace')

`

`@@ -4521,7 +4523,8 @@ def sort_values(self, by, axis=0, ascending=True, inplace=False,

`

4521

4523

`else:

`

4522

4524

`return self._constructor(new_data).finalize(self)

`

4523

4525

``

4524

``

`-

@Appender(_shared_docs['sort_index'] % _shared_doc_kwargs)

`

``

4526

`+

@Substitution(**_shared_doc_kwargs)

`

``

4527

`+

@Appender(NDFrame.sort_index.doc)

`

4525

4528

`def sort_index(self, axis=0, level=None, ascending=True, inplace=False,

`

4526

4529

`kind='quicksort', na_position='last', sort_remaining=True,

`

4527

4530

`by=None):

`

`@@ -4886,7 +4889,7 @@ def _arith_op(left, right):

`

4886

4889

`left, right = ops.fill_binop(left, right, fill_value)

`

4887

4890

`return func(left, right)

`

4888

4891

``

4889

``

`-

if this._is_mixed_type or other._is_mixed_type:

`

``

4892

`+

if ops.should_series_dispatch(this, other, func):

`

4890

4893

`# iterate over columns

`

4891

4894

`return ops.dispatch_to_series(this, other, _arith_op)

`

4892

4895

`else:

`

`@@ -4896,7 +4899,6 @@ def _arith_op(left, right):

`

4896

4899

`copy=False)

`

4897

4900

``

4898

4901

`def _combine_match_index(self, other, func, level=None):

`

4899

``

`-

assert isinstance(other, Series)

`

4900

4902

`left, right = self.align(other, join='outer', axis=0, level=level,

`

4901

4903

`copy=False)

`

4902

4904

`assert left.index.equals(right.index)

`

`@@ -4916,11 +4918,7 @@ def _combine_match_columns(self, other, func, level=None, try_cast=True):

`

4916

4918

`left, right = self.align(other, join='outer', axis=1, level=level,

`

4917

4919

`copy=False)

`

4918

4920

`assert left.columns.equals(right.index)

`

4919

``

-

4920

``

`-

new_data = left._data.eval(func=func, other=right,

`

4921

``

`-

axes=[left.columns, self.index],

`

4922

``

`-

try_cast=try_cast)

`

4923

``

`-

return self._constructor(new_data)

`

``

4921

`+

return ops.dispatch_to_series(left, right, func, axis="columns")

`

4924

4922

``

4925

4923

`def _combine_const(self, other, func, errors='raise', try_cast=True):

`

4926

4924

`if lib.is_scalar(other) or np.ndim(other) == 0:

`

`@@ -7747,7 +7745,7 @@ def convert(v):

`

7747

7745

`values = np.array([convert(v) for v in values])

`

7748

7746

`else:

`

7749

7747

`values = convert(values)

`

7750

``

`-

except:

`

``

7748

`+

except (ValueError, TypeError):

`

7751

7749

`values = convert(values)

`

7752

7750

``

7753

7751

`else:

`