Skip to content

CLN: remove nested error handling #27792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 7, 2019
Merged

CLN: remove nested error handling #27792

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1c5972
CLN: remove nested error handling
jbrockmendel Aug 7, 2019
fe7b9e4
un-xfail
jbrockmendel Aug 7, 2019
d712569
make xfail conditional
jbrockmendel Aug 7, 2019
b60e1b8
Merge branch 'master' of https://github.com/pandas-dev/pandas into er…
jbrockmendel Aug 7, 2019
1930c22
restore xfail
jbrockmendel Aug 7, 2019
c5cee5e
unused import
jbrockmendel Aug 7, 2019
4a1e175
dummy to force CI
jbrockmendel Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions pandas/core/internals/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,20 +1366,8 @@ def func(cond, values, other):
# np.where will cast integer array to floats in this case
other = self._try_coerce_args(other)

try:
fastres = expressions.where(cond, values, other)
return fastres
except Exception as detail:
if errors == "raise":
raise TypeError(
"Could not operate [{other!r}] with block values "
"[{detail!s}]".format(other=other, detail=detail)
)
else:
# return the values
result = np.empty(values.shape, dtype="float64")
result.fill(np.nan)
return result
fastres = expressions.where(cond, values, other)
return fastres

if cond.ravel().all():
result = values
Expand Down