Skip to content

ENH: Add the decimal.Decimal type to infer_dtypes (#15690) #16426

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

ENH: Add the decimal.Decimal type to infer_dtypes (#15690) #16426

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc15e85
ENH: Add the decimal.Decimal type to infer_dtypes (#15690)
margaret May 22, 2017
e7e67e8
Reference GH15690 in test_decimals
margaret May 22, 2017
b291b62
Add enhancement from issue #15690
margaret May 22, 2017
024feac
Check that decimal and non-decimal returns 'mixed'
margaret May 22, 2017
cc9ac39
Fix reference to infer_dtype func
margaret May 22, 2017
6f158cb
update infer_dtype docstring with decimal example
margaret May 22, 2017
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
4 changes: 3 additions & 1 deletion pandas/_libs/src/inference.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,6 @@ def infer_dtype(object value):
'categorical'

"""
Copy link
Contributor

Choose a reason for hiding this comment

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

pls update the doc-string & add an example

Copy link
Contributor Author

Choose a reason for hiding this comment

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

6f158cb


cdef:
Py_ssize_t i, n
object val
Expand Down Expand Up @@ -407,6 +406,9 @@ def infer_dtype(object value):
if is_time_array(values):
return 'time'

elif is_decimal(val):
return 'decimal'

elif util.is_float_object(val):
if is_float_array(values):
return 'floating'
Expand Down
6 changes: 6 additions & 0 deletions pandas/tests/dtypes/test_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import collections
import re
from datetime import datetime, date, timedelta, time
from decimal import Decimal
import numpy as np
import pytz
import pytest
Expand Down Expand Up @@ -462,6 +463,11 @@ def test_floats(self):
result = lib.infer_dtype(arr)
assert result == 'floating'

def test_decimals(self):
arr = np.array([Decimal(1), Decimal(2), Decimal(3)])
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add a comment with a link to the github issue? (#15690)

result = lib.infer_dtype(arr)
assert result == 'decimal'

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, could you add a test with a mix of Decimal and non-decimal (like floats) and make sure that the return is mixed? Or search through and see if we have a test that already covers this. Other than that, this looks great.

def test_string(self):
pass

Expand Down