Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions dashtable/html2data/extract_spans.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def extract_spans(html_string: str) -> Optional[DATA_SPANS]:
if not table:
return []

trs = table.findAll('tr')
trs = table.find_all('tr')
if len(trs) == 0:
return []

Expand All @@ -37,12 +37,12 @@ def extract_spans(html_string: str) -> Optional[DATA_SPANS]:

for tr in range(len(trs)):
if tr == 0:
ths = trs[tr].findAll('th')
ths = trs[tr].find_all('th')
if len(ths) == 0:
ths = trs[tr].findAll('td')
ths = trs[tr].find_all('td')
tds = ths
else:
tds = trs[tr].findAll('td')
tds = trs[tr].find_all('td')

if spans_arr is None:
column = 0
Expand Down
6 changes: 3 additions & 3 deletions dashtable/html2data/extract_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ def extract_table(html_string, row_count, column_count):
if not table:
return ''

trs = table.findAll('tr')
trs = table.find_all('tr')
if len(trs) == 0:
return [['']]

for tr in range(len(trs)):
ths = trs[tr].findAll('th')
ths = trs[tr].find_all('th')
if len(ths) == 0:
tds = trs[tr].findAll('td')
tds = trs[tr].find_all('td')
else:
tds = ths

Expand Down
8 changes: 4 additions & 4 deletions dashtable/html2data/get_html_column_count.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ def get_html_column_count(html_string):
return 0

column_counts = []
trs = table.findAll('tr')
trs = table.find_all('tr')
if len(trs) == 0:
return 0

for tr in range(len(trs)):
if tr == 0:
tds = trs[tr].findAll('th')
tds = trs[tr].find_all('th')
if len(tds) == 0:
tds = trs[tr].findAll('td')
tds = trs[tr].find_all('td')
else:
tds = trs[tr].findAll('td')
tds = trs[tr].find_all('td')

count = 0
for td in tds:
Expand Down
2 changes: 1 addition & 1 deletion dashtable/html2data/headers_present.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def headers_present(html_string):
if not table:
return False

th = table.findAll('th')
th = table.find_all('th')
if len(th) > 0:
return True
else:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

bs4
beautifulsoup4
docutils
numpy
typing_extensions
Expand Down