8000 read_html: Handle colspan and rowspan by adamhooper · Pull Request #21487 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

read_html: Handle colspan and rowspan #21487

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 14 commits into from
Jul 5, 2018
Merged

read_html: Handle colspan and rowspan #21487

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3e58794
Handle colspan and rowspan
adamhooper Jun 14, 2018
f89b32a
Fixes after code review -- thanks, @WillAyd
adamhooper Jun 15, 2018
34f87cb
Docstring tweaks
adamhooper Jun 15, 2018
582c86b
Details -- thanks, @jreback
adamhooper Jun 15, 2018
d2f0b83
Tweak comments
adamhooper Jun 15, 2018
74c2384
Address latest review comments from @WillAyd
adamhooper Jun 15, 2018
ad6e869
Clean up html tests
adamhooper Jun 21, 2018
6fa0489
Do not nix rows of empty
adamhooper Jun 21, 2018
86b2dea
Merge branch 'master' into colspan-rowspan
adamhooper Jul 2, 2018
d4f4bb1
Comments: Notes after Returns
adamhooper Jul 3, 2018
e296bd1
Document read_html changes in whatsnew
adamhooper Jul 4, 2018
f0f91c3
Merge branch 'master' into colspan-rowspan
adamhooper Jul 4, 2018
95ce993
Improve whatsnew with ipython
adamhooper Jul 4, 2018
5fd863b
fixup whatsnew
jreback Jul 5, 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
Comments: Notes after Returns
  • Loading branch information
@adamhooper
adamhooper committed Jul 3, 2018
commit d4f4bb1ade73278d97daf1fee08575227dbd8fb1
26 changes: 13 additions & 13 deletions pandas/io/html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,14 @@ def _parse_thead_tbody_tfoot(self, table_html):
"""
Given a table, return parsed header, body, and foot.

Parameters
----------
table_html : node-like

Returns
-------
tuple of (header, body, footer), each a list of list-of-text rows.

Notes
Copy link
Contributor

Choose a reason for hiding this comment

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

put Notes at the end (after Parameters / Returns)

-----
Header and body are lists-of-lists. Top level list is a list of
Expand All @@ -391,14 +399,6 @@ def _parse_thead_tbody_tfoot(self, table_html):
all elements inside row are <th>
- Move rows from bottom of body to footer only if
all elements inside row are <th>

Parameters
----------
table_html : node-like

Returns
-------
tuple of (header, body, footer), each a list of list-of-text rows.
"""

header_rows = self._parse_thead_tr(table_html)
Expand Down Expand Up @@ -426,11 +426,6 @@ def _expand_colspan_rowspan(self, rows):
"""
Given a list of <tr>s, return a list of text rows.

Notes
-----
Any cell with ``rowspan`` or ``colspan`` will have its contents copied
to subsequent cells.

Parameters
----------
rows : list of node-like
Expand All @@ -440,6 +435,11 @@ def _expand_colspan_rowspan(self, rows):
-------
list of list
Each returned row is a list of str text.

Notes
-----
Any cell with ``rowspan`` or ``colspan`` will have its contents copied
to subsequent cells.
"""

all_texts = [] # list of rows, each a list of str
Expand Down
0