Skip to content

BUG: raise for invalid dtypes per issue #15520 #16047

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

Closed
wants to merge 15 commits into from
Closed

BUG: raise for invalid dtypes per issue #15520 #16047

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
99fb660
TST: wrote test representing bug fix result for #15520
analyticalmonk Apr 18, 2017
fecba12
BUG: Raise when invalid dtype passed to pandas_dtype
analyticalmonk Apr 18, 2017
c10e1d4
TST: maintain list containing dtypes in TestPandasDtype
analyticalmonk Apr 18, 2017
3700259
CLN: Replace _coerce_to_dtype() with pandas_dtype()
analyticalmonk Apr 18, 2017
ee0030f
TST: added more test-cases for pandas_dtype() test
analyticalmonk Apr 20, 2017
d4971cd
BUG: pandas_dtype() to raise error for invalid dtype per GH15520
analyticalmonk Apr 20, 2017
f858726
style fix
analyticalmonk Apr 21, 2017
3eaa432
TST: Added numpy.object_ dtype to valid pandas_dtype list
analyticalmonk Apr 21, 2017
a358181
BUG: Added numpy.dtype_ to valid pandas_dtype() type list
analyticalmonk Apr 21, 2017
ad9f345
CLN: refactored code related to issue GH15520
analyticalmonk Apr 24, 2017
fbed5a6
TST: Added list to invalid dtype
analyticalmonk Apr 24, 2017
c3699fb
DOC: added whatsnew entry for PR#16047 addressing GH15520
analyticalmonk Apr 25, 2017
b3c2fbb
BUG: Added 'O' to pandas_dtype's valid list
analyticalmonk Apr 25, 2017
73d980a
Merge branch 'master' into patch_for_15520
analyticalmonk Apr 25, 2017
3646eb6
TST: check for invalid dtype for Series constructor per GH15520
Apr 25, 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
Prev Previous commit
Next Next commit
CLN: Replace _coerce_to_dtype() with pandas_dtype() 
Changes made to series.py, generic.py in pandas/core and cast.py in pandas/core/dtypes
  • Loading branch information
@analyticalmonk
analyticalmonk committed Apr 24, 2017
commit 3700259dcb6ab3193b5c517466f8e9fded8ed2c7
4 changes: 2 additions & 2 deletions pandas/core/dtypes/cast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
is_numeric_dtype, is_decimal,
is_number,
_string_dtypes,
_coerce_to_dtype,
pandas_dtype,
_ensure_int8, _ensure_int16,
_ensure_int32, _ensure_int64,
_NS_DTYPE, _TD_DTYPE, _INT64_DTYPE,
Expand Down Expand Up @@ -579,7 +579,7 @@ def astype_nansafe(arr, dtype, copy=True):
""" return a view if copy is False, but
need to be very careful as the result shape could change! """
if not isinstance(dtype, np.dtype):
dtype = _coerce_to_dtype(dtype)
dtype = pandas_dtype(dtype)

if issubclass(dtype.type, text_type):
# in Py3 that's str, in Py2 that's unicode
Expand Down
2 changes: 0 additions & 2 deletions pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

from pandas._libs import tslib, lib
from pandas.core.dtypes.common import (
_coerce_to_dtype,
_ensure_int64,
needs_i8_conversion,
is_scalar,
Expand Down Expand Up @@ -165,7 +164,6 @@ def _validate_dtype(self, dtype):
""" validate the passed dtype """

if dtype is not None:
dtype = _coerce_to_dtype(dtype)
# This would raise an error if an invalid dtype was passed
Copy link
Contributor

Choose a reason for hiding this comment

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

comment not necessary

dtype = pandas_dtype(dtype)

Expand Down
7 changes: 4 additions & 3 deletions pandas/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import numpy.ma as ma

from pandas.core.dtypes.common import (
_coerce_to_dtype, is_categorical_dtype,
is_categorical_dtype,
is_bool,
is_integer, is_integer_dtype,
is_float_dtype,
Expand All @@ -28,7 +28,8 @@
is_dict_like,
is_scalar,
_is_unorderable_exception,
_ensure_platform_int)
_ensure_platform_int,
pandas_dtype)
from pandas.core.dtypes.generic import ABCSparseArray, ABCDataFrame
from pandas.core.dtypes.cast import (
maybe_upcast, infer_dtype_from_scalar,
Expand Down Expand Up @@ -2869,7 +2870,7 @@ def _sanitize_array(data, index, dtype=None, copy=False,
"""

if dtype is not None:
dtype = _coerce_to_dtype(dtype)
dtype = pandas_dtype(dtype)

if isinstance(data, ma.MaskedArray):
mask = ma.getmaskarray(data)
Expand Down