Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
0fdbfd3
wip
TomAugspurger Nov 9, 2018
ace62aa
Deprecate formatting_values
TomAugspurger Nov 9, 2018
6e76b51
test for warning
TomAugspurger Nov 9, 2018
fef04e6
compat
TomAugspurger Nov 9, 2018
1885a97
na formatter
TomAugspurger Nov 9, 2018
ecfcd72
clean
TomAugspurger Nov 9, 2018
4e0d91f
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Nov 9, 2018
37638cc
wip
TomAugspurger Nov 9, 2018
6e64b7b
more cleanup
TomAugspurger Nov 9, 2018
193747e
update docs, type
TomAugspurger Nov 9, 2018
5a2e1e4
format
TomAugspurger Nov 9, 2018
1635b73
try this
TomAugspurger Nov 9, 2018
e2b1941
updates
TomAugspurger Nov 9, 2018
48e55cc
fixup interval
TomAugspurger Nov 10, 2018
d8e7ba4
py2 compat
TomAugspurger Nov 10, 2018
b312fe4
revert interval
TomAugspurger Nov 10, 2018
445736d
unicode, bytes
TomAugspurger Nov 10, 2018
60e0d02
isort
TomAugspurger Nov 10, 2018
5b07906
py3 fixup
TomAugspurger Nov 10, 2018
ff0c998
fixup
TomAugspurger Nov 10, 2018
2fd3d5d
unicode
TomAugspurger Nov 10, 2018
5d8d2fc
unicode
TomAugspurger Nov 10, 2018
baee6b2
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Nov 10, 2018
4d343ea
unicode
TomAugspurger Nov 10, 2018
5b291d5
lint
TomAugspurger Nov 10, 2018
1b93bf0
update repr tests
TomAugspurger Nov 11, 2018
708dd75
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Nov 12, 2018
0f4083e
remove periodarray
TomAugspurger Nov 12, 2018
9116930
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Nov 12, 2018
ebadf6f
FutureWarning -> DeprecationWarning
TomAugspurger Nov 12, 2018
e5f6976
wip
TomAugspurger Nov 12, 2018
221cee9
use repr
TomAugspurger Nov 12, 2018
439f2f8
fixup! use repr
TomAugspurger Nov 12, 2018
2364546
fixup! fixup! use repr
TomAugspurger Nov 12, 2018
62b1e2f
remove bytes
TomAugspurger Nov 12, 2018
a926dca
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Nov 14, 2018
fc4279d
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Nov 15, 2018
27db397
simplify formatter
TomAugspurger Nov 15, 2018
5c253a4
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Nov 19, 2018
ef390fc
Updates: misc
TomAugspurger Nov 19, 2018
2b5fe25
BUG: Fixed SparseArray formatter
TomAugspurger Nov 19, 2018
d84cc02
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Nov 20, 2018
d9df6bf
correct boxing
TomAugspurger Nov 20, 2018
a35399e
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Nov 20, 2018
740f9e5
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Nov 28, 2018
e7cc2ac
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Nov 28, 2018
c79ba0b
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Dec 2, 2018
3825aeb
Use Array formatter in PeriodIndex
TomAugspurger Dec 2, 2018
2a60c15
Use repr / str
TomAugspurger Dec 2, 2018
bccf40d
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Dec 3, 2018
a7ef104
Update for review
TomAugspurger Dec 3, 2018
a3b1c92
REF: removed trailing_comma argument
TomAugspurger Dec 3, 2018
e080023
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Dec 3, 2018
6ad113b
Merge remote-tracking branch 'upstream/master' into ea-repr
TomAugspurger Dec 3, 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
Prev Previous commit
Next Next commit
updates
  • Loading branch information
TomAugspurger committed Nov 9, 2018
commit e2b1941f72ace652af8d125e6ef4aa85d18f6112
1 change: 1 addition & 0 deletions doc/source/whatsnew/v0.24.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1120,6 +1120,7 @@ Datetimelike
- Bug in rounding methods of :class:`DatetimeIndex` (:meth:`~DatetimeIndex.round`, :meth:`~DatetimeIndex.ceil`, :meth:`~DatetimeIndex.floor`) and :class:`Timestamp` (:meth:`~Timestamp.round`, :meth:`~Timestamp.ceil`, :meth:`~Timestamp.floor`) could give rise to loss of precision (:issue:`22591`)
- Bug in :func:`to_datetime` with an :class:`Index` argument that would drop the ``name`` from the result (:issue:`21697`)
- Bug in :class:`PeriodIndex` where adding or subtracting a :class:`timedelta` or :class:`Tick` object produced incorrect results (:issue:`22988`)
- Bug in the :class:`Series` repr with Period data missing a space before the data (:issue:`23601`)
- Bug in :func:`date_range` when decrementing a start date to a past end date by a negative frequency (:issue:`23270`)
- Bug in :meth:`Series.min` which would return ``NaN`` instead of ``NaT`` when called on a series of ``NaT`` (:issue:`23282`)
- Bug in :func:`DataFrame.combine` with datetimelike values raising a TypeError (:issue:`23079`)
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/arrays/period.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ def end_time(self):

def _formatter(self, formatter=None):
if formatter:
return str
return formatter.formatter or str
return "'{}'".format

def __setitem__(
Expand Down
10 changes: 10 additions & 0 deletions pandas/core/arrays/sparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -1661,6 +1661,16 @@ def __unicode__(self):
fill=printing.pprint_thing(self.fill_value),
index=printing.pprint_thing(self.sp_index))

def _formatter(self, formatter=None):
if formatter is None:
def fmt(x):
if isna(x) and isinstance(x, float):
return 'NaN'
return str(x)

return fmt
return formatter.formatter


SparseArray._add_arithmetic_ops()
SparseArray._add_comparison_ops()
Expand Down
40 changes: 20 additions & 20 deletions pandas/tests/series/test_repr.py
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,11 @@ def test_categorical_series_repr_datetime_ordered(self):
def test_categorical_series_repr_period(self):
idx = period_range('2011-01-01 09:00', freq='H', periods=5)
s = Series(Categorical(idx))
exp = """0 2011-01-01 09:00
1 2011-01-01 10:00
2 2011-01-01 11:00
3 2011-01-01 12:00
4 2011-01-01 13:00
exp = """0 2011-01-01 09:00
1 2011-01-01 10:00
2 2011-01-01 11:00
3 2011-01-01 12:00
4 2011-01-01 13:00
dtype: category
Categories (5, period[H]): [2011-01-01 09:00, 2011-01-01 10:00, 2011-01-01 11:00, 2011-01-01 12:00,
2011-01-01 13:00]""" # noqa
Expand All @@ -377,11 +377,11 @@ def test_categorical_series_repr_period(self):

idx = period_range('2011-01', freq='M', periods=5)
s = Series(Categorical(idx))
exp = """0 2011-01
1 2011-02
2 2011-03
3 2011-04
4 2011-05
exp = """0 2011-01
1 2011-02
2 2011-03
3 2011-04
4 2011-05
dtype: category
Categories (5, period[M]): [2011-01, 2011-02, 2011-03, 2011-04, 2011-05]"""

Expand All @@ -390,11 +390,11 @@ def test_categorical_series_repr_period(self):
def test_categorical_series_repr_period_ordered(self):
idx = period_range('2011-01-01 09:00', freq='H', periods=5)
s = Series(Categorical(idx, ordered=True))
exp = """0 2011-01-01 09:00
1 2011-01-01 10:00
2 2011-01-01 11:00
3 2011-01-01 12:00
4 2011-01-01 13:00
exp = """0 2011-01-01 09:00
1 2011-01-01 10:00
2 2011-01-01 11:00
3 2011-01-01 12:00
4 2011-01-01 13:00
dtype: category
Categories (5, period[H]): [2011-01-01 09:00 < 2011-01-01 10:00 < 2011-01-01 11:00 < 2011-01-01 12:00 <
2011-01-01 13:00]""" # noqa
Expand All @@ -403,11 +403,11 @@ def test_categorical_series_repr_period_ordered(self):

idx = period_range('2011-01', freq='M', periods=5)
s = Series(Categorical(idx, ordered=True))
exp = """0 2011-01
1 2011-02
2 2011-03
3 2011-04
4 2011-05
exp = """0 2011-01
1 2011-02
2 2011-03
3 2011-04
4 2011-05
dtype: category
Categories (5, period[M]): [2011-01 < 2011-02 < 2011-03 < 2011-04 < 2011-05]"""

Expand Down