Skip to content

Commit cc712c9

Browse files
simonjayhawkinsjreback
authored andcommitted
CLN: io/formats/html.py: refactor (#22726)
1 parent deedb5f commit cc712c9

File tree

1 file changed

+9
-45
lines changed

1 file changed

+9
-45
lines changed

pandas/io/formats/html.py

+9-45
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def _write_cell(self, s, kind='td', indent=0, tags=None):
7878
self.write(u'{start}{rs}</{kind}>'
7979
.format(start=start_tag, rs=rs, kind=kind), indent)
8080

81-
def write_tr(self, line, indent=0, indent_delta=4, header=False,
81+
def write_tr(self, line, indent=0, indent_delta=0, header=False,
8282
align=None, tags=None, nindex_levels=0):
8383
if tags is None:
8484
tags = {}
@@ -200,26 +200,6 @@ def _write_header(self, indent):
200200
# write nothing
201201
return indent
202202

203-
def _column_header():
204-
if self.fmt.index:
205-
row = [''] * (self.frame.index.nlevels - 1)
206-
else:
207-
row = []
208-
209-
if isinstance(self.columns, ABCMultiIndex):
210-
if self.fmt.has_column_names and self.fmt.index:
211-
row.append(single_column_table(self.columns.names))
212-
else:
213-
row.append('')
214-
style = "text-align: {just};".format(just=self.fmt.justify)
215-
row.extend([single_column_table(c, self.fmt.justify, style)
216-
for c in self.columns])
217-
else:
218-
if self.fmt.index:
219-
row.append(self.columns.name or '')
220-
row.extend(self.columns)
221-
return row
222-
223203
self.write('<thead>', indent)
224204

225205
indent += self.indent_delta
@@ -301,16 +281,21 @@ def _column_header():
301281
self.write_tr(row, indent, self.indent_delta, tags=tags,
302282
header=True)
303283
else:
304-
col_row = _column_header()
284+
if self.fmt.index:
285+
row = [''] * (self.frame.index.nlevels - 1)
286+
row.append(self.columns.name or '')
287+
else:
288+
row = []
289+
row.extend(self.columns)
305290
align = self.fmt.justify
306291

307292
if truncate_h:
308293
if not self.fmt.index:
309294
row_levels = 0
310295
ins_col = row_levels + self.fmt.tr_col_num
311-
col_row.insert(ins_col, '...')
296+
row.insert(ins_col, '...')
312297

313-
self.write_tr(col_row, indent, self.indent_delta, header=True,
298+
self.write_tr(row, indent, self.indent_delta, header=True,
314299
align=align)
315300

316301
if all((self.fmt.has_index_names,
@@ -486,24 +471,3 @@ def _write_hierarchical_rows(self, fmt_values, indent):
486471
row.insert(row_levels + self.fmt.tr_col_num, '...')
487472
self.write_tr(row, indent, self.indent_delta, tags=None,
488473
nindex_levels=frame.index.nlevels)
489-
490-
491-
def single_column_table(column, align=None, style=None):
492-
table = '<table'
493-
if align is not None:
494-
table += (' align="{align}"'.format(align=align))
495-
if style is not None:
496-
table += (' style="{style}"'.format(style=style))
497-
table += '><tbody>'
498-
for i in column:
499-
table += ('<tr><td>{i!s}</td></tr>'.format(i=i))
500-
table += '</tbody></table>'
501-
return table
502-
503-
504-
def single_row_table(row): # pragma: no cover
505-
table = '<table><tbody><tr>'
506-
for i in row:
507-
table += ('<td>{i!s}</td>'.format(i=i))
508-
table += '</tr></tbody></table>'
509-
return table

0 commit comments

Comments
 (0)