Skip to content

Improve string concatenation #385

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve string concatenation #385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 15 additions & 10 deletions tabulate/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,10 @@ def _pipe_line_with_colons(colwidths, colaligns):
alignment (as in `pipe` output format)."""
if not colaligns: # e.g. printing an empty data frame (github issue #15)
colaligns = [""] * len(colwidths)
segments = [_pipe_segment_with_colons(a, w) for a, w in zip(colaligns, colwidths)]
return "|" + "|".join(segments) + "|"
segments = "|".join(
_pipe_segment_with_colons(a, w) for a, w in zip(colaligns, colwidths)
)
return f"|{segments}|"


def _grid_segment_with_colons(colwidth, align):
Expand All @@ -165,8 +167,10 @@ def _grid_line_with_colons(colwidths, colaligns):
in a grid table."""
if not colaligns:
colaligns = [""] * len(colwidths)
segments = [_grid_segment_with_colons(w, a) for a, w in zip(colaligns, colwidths)]
return "+" + "+".join(segments) + "+"
segments = "+".join(
_grid_segment_with_colons(w, a) for a, w in zip(colaligns, colwidths)
)
return f"+{segments}+"


def _mediawiki_row_with_attrs(separator, cell_values, colwidths, colaligns):
Expand All @@ -188,8 +192,8 @@ def _mediawiki_row_with_attrs(separator, cell_values, colwidths, colaligns):
def _textile_row_with_attrs(cell_values, colwidths, colaligns):
cell_values[0] += " "
alignment = {"left": "<.", "right": ">.", "center": "=.", "decimal": ">."}
values = (alignment.get(a, "") + v for a, v in zip(colaligns, cell_values))
return "|" + "|".join(values) + "|"
values = "|".join(alignment.get(a, "") + v for a, v in zip(colaligns, cell_values))
return f"|{values}|"


def _html_begin_table_without_header(colwidths_ignore, colaligns_ignore):
Expand Down Expand Up @@ -258,10 +262,10 @@ def make_header_line(is_header, colwidths, colaligns):
asciidoc_alignments = zip(
colwidths, [alignment[colalign] for colalign in colaligns]
)
asciidoc_column_specifiers = [
asciidoc_column_specifiers = ",".join(
f"{width:d}{align}" for width, align in asciidoc_alignments
]
header_list = ['cols="' + (",".join(asciidoc_column_specifiers)) + '"']
)
header_list = [f'cols="{asciidoc_column_specifiers}"']

# generate the list of options (currently only "header")
options_list = []
Expand All @@ -270,7 +274,8 @@ def make_header_line(is_header, colwidths, colaligns):
options_list.append("header")

if options_list:
header_list += ['options="' + ",".join(options_list) + '"']
options_list = ",".join(options_list)
header_list.append(f'options="{options_list}"')

# generate the list of entries in the table header field

Expand Down
Loading