Skip to content

Preserve None in Series unique #20893

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 6 commits into from
May 11, 2018
Merged

Preserve None in Series unique #20893

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f33a4c5
Added test for preservation of NA values in Series unique
WillAyd May 1, 2018
9736ecb
Merge remote-tracking branch 'upstream/master' into uniq-tst
WillAyd May 1, 2018
f791e5e
Merge remote-tracking branch 'upstream/master' into uniq-tst
WillAyd May 4, 2018
1e83e60
Reverted none to nan conversion in unique
WillAyd May 4, 2018
df28111
Moved test; added comments
WillAyd May 5, 2018
f106b58
Merge remote-tracking branch 'upstream/master' into uniq-tst
WillAyd May 5, 2018
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_class_helper.pxi.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ cdef class PyObjectHashTable(HashTable):
for i in range(n):
val = values[i]
hash(val)
if not checknull(val):
if not checknull(val) or val is None:
Copy link
Contributor

Choose a reason for hiding this comment

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

needs a comment here, checkull is specifically designed to catch ALL nulls here.

k = kh_get_pymap(self.table, <PyObject*>val)
if k == self.table.n_buckets:
kh_put_pymap(self.table, <PyObject*>val, &ret)
Expand Down
6 changes: 6 additions & 0 deletions pandas/tests/series/test_analytics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,6 +1015,12 @@ def test_unique(self):
tm.assert_categorical_equal(s.unique(), pd.Categorical([np.nan]),
check_dtype=False)

def test_unique_obj_none_preservation(self):
# GH 20866
s = pd.Series(['foo', None])
result = s.unique()
assert result[1] is None
Copy link
Contributor

Choose a reason for hiding this comment

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

construct array and compare. this should be in test_algorithms

Copy link
Member

Choose a reason for hiding this comment

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

Make sure to use strict_nan=True in that case

Copy link
Contributor

Choose a reason for hiding this comment

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

good point


@pytest.mark.parametrize(
"tc1, tc2",
[
Expand Down