Skip to content

Commit db8ea2e

Browse files
committed
Remove product code update
1 parent d5eec76 commit db8ea2e

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed

pandas/core/algorithms.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -712,14 +712,12 @@ def value_counts(
712712
else:
713713
keys, counts = _value_counts_arraylike(values, dropna)
714714

715-
result = Series(counts, index=keys, name=name, dtype="Int64")
715+
result = Series(counts, index=keys, name=name)
716716

717717
if sort:
718718
result = result.sort_values(ascending=ascending)
719719

720720
if normalize:
721-
if not isinstance(counts, np.ndarray):
722-
counts = counts.to_numpy()
723721
result = result / float(counts.sum())
724722
else:
725723
result = result.astype("Int64")

pandas/core/groupby/generic.py

+8-12
Original file line numberDiff line numberDiff line change
@@ -757,15 +757,12 @@ def value_counts(
757757
mi = MultiIndex(
758758
levels=levels, codes=codes, names=names, verify_integrity=False
759759
)
760+
dtype = "float64"
760761

761762
if is_integer_dtype(out):
762-
return Series(
763-
ensure_int64(out),
764-
index=mi,
765-
name=self._selection_name,
766-
dtype="Int64",
767-
)
768-
return Series(out, index=mi, name=self._selection_name)
763+
out = ensure_int64(out)
764+
dtype = "Int64"
765+
return Series(out, index=mi, name=self._selection_name, dtype=dtype)
769766

770767
# for compat. with libgroupby.value_counts need to ensure every
771768
# bin is present at every index level, null filled with zeros
@@ -794,13 +791,12 @@ def build_codes(lev_codes: np.ndarray) -> np.ndarray:
794791
codes.append(left[-1])
795792

796793
mi = MultiIndex(levels=levels, codes=codes, names=names, verify_integrity=False)
794+
dtype = "float64"
797795

798796
if is_integer_dtype(out):
799-
return Series(
800-
ensure_int64(out), index=mi, name=self._selection_name, dtype="Int64"
801-
)
802-
803-
return Series(out, index=mi, name=self._selection_name)
797+
out = ensure_int64(out)
798+
dtype = "Int64"
799+
return Series(out, index=mi, name=self._selection_name, dtype=dtype)
804800

805801
def count(self) -> Series:
806802
"""

pandas/tests/extension/base/methods.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def test_value_counts(self, all_data, dropna):
3535
)
3636

3737
expected = pd.Series([1 / len(other)] * len(other), index=result.index)
38-
self.assert_series_equal(expected, result)
38+
self.assert_series_equal(result, expected)
3939

4040
def test_count(self, data_missing):
4141
df = pd.DataFrame({"A": data_missing})

0 commit comments

Comments
 (0)