Skip to content

CLN: avoid getattr(obj, "values", obj) #33776

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.

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 26 commits into from
Apr 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
92783f1
Checkpoint passing
jbrockmendel Mar 12, 2020
8063185
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Mar 17, 2020
df3ecf3
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Mar 17, 2020
347b9b2
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Mar 23, 2020
1d5348b
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Mar 23, 2020
9db84a2
revert
jbrockmendel Mar 23, 2020
60d4055
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Mar 30, 2020
471feb5
revert
jbrockmendel Mar 31, 2020
038e467
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 2, 2020
167b454
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 3, 2020
47d03e9
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 14, 2020
3f55e4e
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 15, 2020
b63b2c6
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 15, 2020
c2cb84b
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 15, 2020
4d9a6d3
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 17, 2020
29ca346
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 17, 2020
3cc043b
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 18, 2020
14b7e9c
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 24, 2020
aa17f00
Avoid getattr values
jbrockmendel Apr 24, 2020
d99d1c9
revert
jbrockmendel Apr 24, 2020
19e8114
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 24, 2020
de64f05
multiindex fix
jbrockmendel Apr 24, 2020
69f89c1
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 25, 2020
1bf8288
const fix
jbrockmendel Apr 25, 2020
b3e5ef1
Merge branch 'master' of https://github.com/pandas-dev/pandas into no…
jbrockmendel Apr 25, 2020
ea4ece7
remove unnecessary check
jbrockmendel Apr 25, 2020
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
2 changes: 1 addition & 1 deletion pandas/_libs/hashtable_func_helper.pxi.in
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ cpdef value_count_{{dtype}}({{c_type}}[:] values, bint dropna):
{{if dtype == 'object'}}
def duplicated_{{dtype}}(ndarray[{{dtype}}] values, object keep='first'):
{{else}}
def duplicated_{{dtype}}({{c_type}}[:] values, object keep='first'):
def duplicated_{{dtype}}(const {{c_type}}[:] values, object keep='first'):
{{endif}}
cdef:
int ret = 0
Expand Down
6 changes: 5 additions & 1 deletion pandas/core/algorithms.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
ABCExtensionArray,
ABCIndex,
ABCIndexClass,
ABCMultiIndex,
ABCSeries,
)
from pandas.core.dtypes.missing import isna, na_value_for_dtype
Expand Down Expand Up @@ -89,6 +90,10 @@ def _ensure_data(values, dtype=None):
values : ndarray
pandas_dtype : str or dtype
"""
if not isinstance(values, ABCMultiIndex):
# extract_array would raise
values = extract_array(values, extract_numpy=True)

# we check some simple dtypes first
if is_object_dtype(dtype):
return ensure_object(np.asarray(values)), "object"
Expand Down Expand Up @@ -151,7 +156,6 @@ def _ensure_data(values, dtype=None):
elif is_categorical_dtype(values) and (
is_categorical_dtype(dtype) or dtype is None
):
values = getattr(values, "values", values)
values = values.codes
dtype = "category"

Expand Down
1 change: 0 additions & 1 deletion pandas/core/arrays/interval.py
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,6 @@ def fillna(self, value=None, method=None, limit=None):
)
raise TypeError(msg)

value = getattr(value, "_values", value)
self._check_closed_matches(value, name="value")

left = self.left.fillna(value=value.left)
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/computation/expressions.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ def _evaluate_numexpr(op, op_str, a, b):
# we were originally called by a reversed op method
a, b = b, a

a_value = getattr(a, "values", a)
b_value = getattr(b, "values", b)
a_value = a
b_value = b

result = ne.evaluate(
f"a_value {op_str} b_value",
Expand Down
3 changes: 2 additions & 1 deletion pandas/core/window/rolling.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

from pandas.core.base import DataError, PandasObject, SelectionMixin, ShallowMixin
import pandas.core.common as com
from pandas.core.construction import extract_array
from pandas.core.indexes.api import Index, ensure_index
from pandas.core.util.numba_ import NUMBA_FUNC_CACHE
from pandas.core.window.common import (
Expand Down Expand Up @@ -252,7 +253,7 @@ def __iter__(self):
def _prep_values(self, values: Optional[np.ndarray] = None) -> np.ndarray:
"""Convert input to numpy arrays for Cython routines"""
if values is None:
values = getattr(self._selected_obj, "values", self._selected_obj)
values = extract_array(self._selected_obj, extract_numpy=True)

# GH #12373 : rolling functions error on float32 data
# make sure the data is coerced to float64
Expand Down