Skip to content

REF: re-raise AssertionError unchanged #28959

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 3 commits into from
Oct 16, 2019
Merged

REF: re-raise AssertionError unchanged #28959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f29ac7
REF: re-reraise AssertionError unchanged
jbrockmendel Oct 13, 2019
851f6e1
update import
jbrockmendel Oct 13, 2019
2afeaeb
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa…
jbrockmendel Oct 16, 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
8 changes: 4 additions & 4 deletions pandas/_libs/groupby.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ def _group_add(floating[:, :] out,
floating[:, :] sumx, nobs

if len(values) != len(labels):
raise AssertionError("len(index) != len(labels)")
raise ValueError("len(index) != len(labels)")

nobs = np.zeros_like(out)
sumx = np.zeros_like(out)
Expand Down Expand Up @@ -491,7 +491,7 @@ def _group_prod(floating[:, :] out,
floating[:, :] prodx, nobs

if not len(values) == len(labels):
raise AssertionError("len(index) != len(labels)")
raise ValueError("len(index) != len(labels)")

nobs = np.zeros_like(out)
prodx = np.ones_like(out)
Expand Down Expand Up @@ -541,7 +541,7 @@ def _group_var(floating[:, :] out,
assert min_count == -1, "'min_count' only used in add and prod"

if not len(values) == len(labels):
raise AssertionError("len(index) != len(labels)")
raise ValueError("len(index) != len(labels)")

nobs = np.zeros_like(out)
mean = np.zeros_like(out)
Expand Down Expand Up @@ -596,7 +596,7 @@ def _group_mean(floating[:, :] out,
assert min_count == -1, "'min_count' only used in add and prod"

if not len(values) == len(labels):
raise AssertionError("len(index) != len(labels)")
raise ValueError("len(index) != len(labels)")

nobs = np.zeros_like(out)
sumx = np.zeros_like(out)
Expand Down
12 changes: 12 additions & 0 deletions pandas/core/groupby/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,8 @@ def aggregate(self, func=None, *args, **kwargs):

try:
return self._python_agg_general(func, *args, **kwargs)
except AssertionError:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm what's the point of the bare raise here? I get needed to differentiate now from the except Exception, but coupled with change above is there something actually throwing the AssertionError? Or do we mean to be catching ValueError here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but coupled with change above is there something actually throwing the AssertionError

No, which means that during development we can now add assertions and not have them get swallowed.

raise
except Exception:
result = self._aggregate_named(func, *args, **kwargs)

Expand Down Expand Up @@ -887,6 +889,8 @@ def aggregate(self, func=None, *args, **kwargs):
result = self._aggregate_multiple_funcs(
[func], _level=_level, _axis=self.axis
)
except AssertionError:
raise
except Exception:
result = self._aggregate_frame(func)
else:
Expand Down Expand Up @@ -1036,13 +1040,17 @@ def _aggregate_frame(self, func, *args, **kwargs):
for name, data in self:
fres = func(data, *args, **kwargs)
result[name] = self._try_cast(fres, data)
except AssertionError:
raise
except Exception:
return self._aggregate_item_by_item(func, *args, **kwargs)
else:
for name in self.indices:
data = self.get_group(name, obj=obj)
try:
fres = func(data, *args, **kwargs)
except AssertionError:
raise
except Exception:
wrapper = lambda x: func(x, *args, **kwargs)
result[name] = data.apply(wrapper, axis=axis)
Expand Down Expand Up @@ -1398,6 +1406,8 @@ def _choose_path(self, fast_path, slow_path, group):
# if we make it here, test if we can use the fast path
try:
res_fast = fast_path(group)
except AssertionError:
raise
except Exception:
# Hard to know ex-ante what exceptions `fast_path` might raise
return path, res
Expand All @@ -1422,6 +1432,8 @@ def _transform_item_by_item(self, obj, wrapper):
for i, col in enumerate(obj):
try:
output[col] = self[col].transform(wrapper)
except AssertionError:
raise
except Exception:
pass
else:
Expand Down
21 changes: 4 additions & 17 deletions pandas/core/groupby/groupby.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,7 @@ class providing the base-class of operations.
from pandas.core import nanops
import pandas.core.algorithms as algorithms
from pandas.core.arrays import Categorical
from pandas.core.base import (
DataError,
GroupByError,
PandasObject,
SelectionMixin,
SpecificationError,
)
from pandas.core.base import DataError, PandasObject, SelectionMixin
import pandas.core.common as com
from pandas.core.construction import extract_array
from pandas.core.frame import DataFrame
Expand Down Expand Up @@ -862,8 +856,6 @@ def _cython_transform(self, how, numeric_only=True, **kwargs):
result, names = self.grouper.transform(obj.values, how, **kwargs)
except NotImplementedError:
continue
except AssertionError as e:
raise GroupByError(str(e))
if self._transform_should_cast(how):
output[name] = self._try_cast(result, obj)
else:
Expand All @@ -890,12 +882,7 @@ def _cython_agg_general(self, how, alt=None, numeric_only=True, min_count=-1):
if numeric_only and not is_numeric:
continue

try:
result, names = self.grouper.aggregate(
obj.values, how, min_count=min_count
)
except AssertionError as e:
raise GroupByError(str(e))
result, names = self.grouper.aggregate(obj.values, how, min_count=min_count)
output[name] = self._try_cast(result, obj)

if len(output) == 0:
Expand Down Expand Up @@ -1353,8 +1340,8 @@ def f(self, **kwargs):
# try a cython aggregation if we can
try:
return self._cython_agg_general(alias, alt=npfunc, **kwargs)
except AssertionError as e:
raise SpecificationError(str(e))
except AssertionError:
raise
except DataError:
pass
except Exception:
Expand Down
2 changes: 2 additions & 0 deletions pandas/core/groupby/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,8 @@ def _transform(
def agg_series(self, obj, func):
try:
return self._aggregate_series_fast(obj, func)
except AssertionError:
raise
except Exception:
return self._aggregate_series_pure_python(obj, func)

Expand Down
2 changes: 2 additions & 0 deletions pandas/core/resample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,8 @@ def _groupby_and_aggregate(self, how, grouper=None, *args, **kwargs):
result = grouped._aggregate_item_by_item(how, *args, **kwargs)
else:
result = grouped.aggregate(how, *args, **kwargs)
except AssertionError:
raise
except Exception:

# we have a non-reducing function
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/groupby/aggregate/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
date_range,
period_range,
)
from pandas.core.groupby.groupby import SpecificationError
from pandas.core.base import SpecificationError
import pandas.util.testing as tm

from pandas.io.formats.printing import pprint_thing
Expand Down