Skip to content

API: Change str for CategoricalDtype to category #17783

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 5, 2017
Merged

API: Change str for CategoricalDtype to category #17783

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d477cd
API: Change str for CategoricalDtype to category
TomAugspurger Oct 4, 2017
1e8c9ed
Fix test assertion
TomAugspurger Oct 4, 2017
c1774b6
Py2 compat
TomAugspurger Oct 4, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix test assertion
  • Loading branch information
@TomAugspurger
TomAugspurger committed Oct 4, 2017
commit 1e8c9ed630353ffa875229a47138e19b17cd5e19
13 changes: 2 additions & 11 deletions pandas/tests/series/test_analytics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,7 +1784,8 @@ class TestNLargestNSmallest(object):
# not supported on some archs
# Series([3., 2, 1, 2, 5], dtype='complex256'),
Series([3., 2, 1, 2, 5], dtype='complex128'),
Series(list('abcde'))])
Series(list('abcde')),
Series(list('abcde'), dtype='category')])
def test_error(self, r):
dt = r.dtype
msg = ("Cannot use method 'n(larg|small)est' with "
Expand All @@ -1795,16 +1796,6 @@ def test_error(self, r):
with tm.assert_raises_regex(TypeError, msg):
method(arg)

def test_error_categorical_dtype(self):
# same as test_error, but regex hard to escape properly
msg = ("Cannot use method 'n(larg|small)est' with dtype "
"CategoricalDtype.+")
with tm.assert_raises_regex(TypeError, msg):
Series(list('ab'), dtype='category').nlargest(2)

with tm.assert_raises_regex(TypeError, msg):
Series(list('ab'), dtype='category').nsmallest(2)

@pytest.mark.parametrize(
"s",
[v for k, v in s_main_dtypes().iteritems()])
Expand Down