BUG: preserve name in set_categories (#17509) #17517
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| | @@ -2054,9 +2054,10 @@ class CategoricalAccessor(PandasDelegate, NoNewAttributesMixin): | |
| | ||
| """ | ||
| | ||
| def __init__(self, values, index, name): | ||
| self.categorical = values | ||
| self.index = index | ||
| self.name = name | ||
| self._freeze() | ||
| | ||
| def _delegate_property_get(self, name): | ||
| | @@ -2075,14 +2076,15 @@ def _delegate_method(self, name, *args, **kwargs): | |
| method = getattr(self.categorical, name) | ||
| res = method(*args, **kwargs) | ||
| if res is not None: | ||
| return Series(res, index=self.index, name=self.name) | ||
| Contributor There was a problem hiding this comment. Ah, I misread the earlier. Contributor There was a problem hiding this comment. I think if you modify pandas/pandas/core/categorical.py Line 2078 in f11bbf2 data.name. and then modify CategoricalAccessor.__init__ to accept a name. data may not have a name, so maybe getattr(data, 'name', None). Make sense? Contributor There was a problem hiding this comment. so the signature should follow like we do in | ||
| | ||
| @classmethod | ||
| def _make_accessor(cls, data): | ||
| if not is_categorical_dtype(data.dtype): | ||
| raise AttributeError("Can only use .cat accessor with a " | ||
| "'category' dtype") | ||
| return CategoricalAccessor(data.values, data.index, | ||
| getattr(data, 'name', None),) | ||
| | ||
| | ||
| CategoricalAccessor._add_delegate_accessors(delegate=Categorical, | ||
| | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| | @@ -57,6 +57,24 @@ def test_getitem_listlike(self): | |
| expected = c[np.array([100000]).astype(np.int64)].codes | ||
| tm.assert_numpy_array_equal(result, expected) | ||
| | ||
| @pytest.mark.parametrize( | ||
| "method", | ||
| [ | ||
| lambda x: x.cat.set_categories([1, 2, 3]), | ||
| lambda x: x.cat.reorder_categories([2, 3, 1], ordered=True), | ||
| lambda x: x.cat.rename_categories([1, 2, 3]), | ||
| lambda x: x.cat.remove_unused_categories(), | ||
| lambda x: x.cat.remove_categories([2]), | ||
| lambda x: x.cat.add_categories([4]), | ||
| lambda x: x.cat.as_ordered(), | ||
| lambda x: x.cat.as_unordered(), | ||
| ]) | ||
| def test_getname_categorical_accessor(self, method): | ||
| s = pd.Series([1, 2, 3], name='A').astype('category') | ||
| expected = 'A' | ||
| result = method(s).name | ||
| assert result == expected | ||
| Member There was a problem hiding this comment. Instead of doing this, construct the expected Contributor Author There was a problem hiding this comment. But Series is not expected. Only the name is expected, which is a character Member There was a problem hiding this comment. That's because you defined your test as such. The output of We want to make sure that nothing else changes and that the Member There was a problem hiding this comment. @gfyoung In this case asserting only the name is fine I think. Assuming the actual methods are already tested separately, this tests just asserts for all of them they preserve the name. If checking the actual resulting series, all of them would need a different result, so would just over-complicate the test. | ||
| | ||
| Contributor There was a problem hiding this comment. Can you add additional tests for the other delegated methods that this should apply to? | ||
| def test_getitem_category_type(self): | ||
| # GH 14580 | ||
| # test iloc() on Series with Categorical data | ||
| | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sphinx has the ability to do local references (see http://www.sphinx-doc.org/en/stable/markup/inline.html#cross-referencing-arbitrary-locations), so you can do
:ref:`Series.cat <categorical.cat>`instead of listing the actual full url.You only need to add a label at the specific location (put
.. _categorical.cat:on the line before the title):pandas/doc/source/categorical.rst
Lines 148 to 150 in cbb090f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the expected change right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes!