Skip to content

CLN: make Info and DataFrameInfo subclasses #34743

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 18 commits into from
Jun 29, 2020
Merged

CLN: make Info and DataFrameInfo subclasses #34743

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
164ffd1
make Info and DataFrameInfo subclasses
MarcoGorelli Jun 13, 2020
c309ace
revert whatsnew change
MarcoGorelli Jun 13, 2020
773ef96
revert duplicated header assignment
MarcoGorelli Jun 13, 2020
40793bf
revert blank line
MarcoGorelli Jun 13, 2020
80e9376
:art:
MarcoGorelli Jun 13, 2020
9112631
:art:
MarcoGorelli Jun 13, 2020
80c3b37
clarify docstring
MarcoGorelli Jun 13, 2020
8af2743
docsharing
MarcoGorelli Jun 13, 2020
da80c56
use abc
MarcoGorelli Jun 13, 2020
99c3042
BaseInfo
MarcoGorelli Jun 14, 2020
0ac85b0
typo in example
MarcoGorelli Jun 14, 2020
21ae291
move docstrings to base class
MarcoGorelli Jun 18, 2020
b4573eb
type annotations
MarcoGorelli Jun 18, 2020
dfc85fe
reword docstring
MarcoGorelli Jun 18, 2020
3330e8e
fix types
MarcoGorelli Jun 18, 2020
5acdfba
Merge remote-tracking branch 'upstream/master' into info-class
MarcoGorelli Jun 20, 2020
92dc3f3
Merge remote-tracking branch 'upstream/master' into info-class
MarcoGorelli Jun 20, 2020
f87bc22
Merge remote-tracking branch 'upstream/master' into info-class
MarcoGorelli Jun 21, 2020
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
32 changes: 17 additions & 15 deletions pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@

from pandas.io.common import get_filepath_or_buffer
from pandas.io.formats import console, format as fmt
from pandas.io.formats.info import info
from pandas.io.formats.info import DataFrameInfo
import pandas.plotting

if TYPE_CHECKING:
Expand Down Expand Up @@ -2460,11 +2460,11 @@ def to_html(
<class 'pandas.core.frame.DataFrame'>
RangeIndex: 5 entries, 0 to 4
Data columns (total 3 columns):
# Column Non-Null Count Dtype
# Column Non-Null Count Dtype
--- ------ -------------- -----
0 int_col 5 non-null int64
1 text_col 5 non-null object
2 float_col 5 non-null float64
Comment on lines -2462 to -2466
Copy link
Member Author

Choose a reason for hiding this comment

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

I'd accidentally introduced these extra whitespaces when I indented the docstrings as part of a previous PR, and so am fixing them now

0 int_col 5 non-null int64
1 text_col 5 non-null object
2 float_col 5 non-null float64
dtypes: float64(1), int64(1), object(1)
memory usage: 248.0+ bytes

Expand Down Expand Up @@ -2503,23 +2503,23 @@ def to_html(
<class 'pandas.core.frame.DataFrame'>
RangeIndex: 1000000 entries, 0 to 999999
Data columns (total 3 columns):
# Column Non-Null Count Dtype
# Column Non-Null Count Dtype
--- ------ -------------- -----
0 column_1 1000000 non-null object
1 column_2 1000000 non-null object
2 column_3 1000000 non-null object
0 column_1 1000000 non-null object
1 column_2 1000000 non-null object
2 column_3 1000000 non-null object
dtypes: object(3)
memory usage: 22.9+ MB

>>> df.info(memory_usage='deep')
<class 'pandas.core.frame.DataFrame'>
RangeIndex: 1000000 entries, 0 to 999999
Data columns (total 3 columns):
# Column Non-Null Count Dtype
# Column Non-Null Count Dtype
--- ------ -------------- -----
0 column_1 1000000 non-null object
1 column_2 1000000 non-null object
2 column_3 1000000 non-null object
0 column_1 1000000 non-null object
1 column_2 1000000 non-null object
2 column_3 1000000 non-null object
dtypes: object(3)
memory usage: 188.8 MB"""
),
Expand All @@ -2530,7 +2530,7 @@ def to_html(
DataFrame.memory_usage: Memory usage of DataFrame columns."""
),
)
@doc(info)
@doc(DataFrameInfo.info)
def info(
self,
verbose: Optional[bool] = None,
Expand All @@ -2539,7 +2539,9 @@ def info(
memory_usage: Optional[Union[bool, str]] = None,
null_counts: Optional[bool] = None,
) -> None:
return info(self, verbose, buf, max_cols, memory_usage, null_counts)
return DataFrameInfo(
self, verbose, buf, max_cols, memory_usage, null_counts
).info()

def memory_usage(self, index=True, deep=False) -> Series:
"""
Expand Down
Loading