8000 REF: repr - allow block to override values that get formatted by jorisvandenbossche · Pull Request #17143 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

REF: repr - allow block to override values that get formatted #17143

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
Aug 4, 2017
Merged

REF: repr - allow block to override values that get formatted #17143

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
f6e376f
REF: repr - allow block to override values that get formatted
jorisvandenbossche Aug 1, 2017
ec7ff5d
extra redirect + move tests
jorisvandenbossche Aug 2, 2017
7e259c9
add to setup.py + specify int64 in test
jorisvandenbossche Aug 2, 2017
000c6fc
Merge remote-tracking branch 'upstream/master' into internals-formatt…
jorisvandenbossche Aug 2, 2017
dcd3c0f
remove usage of fastpath in test example
jorisvandenbossche Aug 3, 2017
b41b713
pep8
jorisvandenbossche Aug 3, 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
extra redirect + move tests
  • Loading branch information
@jorisvandenbossche
jorisvandenbossche committed Aug 2, 2017
commit ec7ff5d7ed20c5352c7c2bccbee307da1cdd7de6
6 changes: 5 additions & 1 deletion pandas/core/internals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def internal_values(self, dtype=None):
return self.values

def formatting_values(self):
"""Return the internal format used by the DataFrame/SeriesFormatter"""
"""Return the internal values used by the DataFrame/SeriesFormatter"""
return self.internal_values()

def get_values(self, dtype=None):
Expand Down Expand Up @@ -4320,6 +4320,10 @@ def external_values(self):
def internal_values(self):
return self._block.internal_values()

def formatting_values(self):
"""Return the internal values used by the DataFrame/SeriesFormatter"""
return self._block.formatting_values()

def get_values(self):
""" return a dense type view """
return np.array(self._block.to_dense(), copy=False)
Expand Down
6 changes: 3 additions & 3 deletions pandas/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,10 @@ def _values(self):
return self._data.internal_values()

def _formatting_values(self):
"""Return the values that can be formatted (used by Series and
DataFrameFormatter)
"""Return the values that can be formatted (used by SeriesFormatter
and DataFrameFormatter)
"""
return self._data._block.formatting_values()
return self._data.formatting_values()

def get_values(self):
""" same as values (but handles sparseness conversions); is a view """
Expand Down
Empty file added pandas/tests/internals/__init__.py
View file
Open in desktop
Empty file.
0 ...as/tests/test_internals_external_block.py → ...as/tests/internals/test_external_block.py
View file
Open in desktop
File renamed without changes.
0 pandas/tests/test_internals.py → pandas/tests/internals/test_internals.py
View file
Open in desktop
File renamed without changes.
0