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
13 changes: 12 additions & 1 deletion tabulate/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,23 @@ def _mediawiki_row_with_attrs(separator, cell_values, colwidths, colaligns):
# hard-coded padding _around_ align attribute and value together
# rather than padding parameter which affects only the value
values_with_attrs = [
" " + alignment.get(a, "") + c + " " for c, a in zip(cell_values, colaligns)
" "
+ alignment.get(a, "")
+ _escape_mediawiki_value(c, separator)
+ " "
for c, a in zip(cell_values, colaligns)
]
colsep = separator * 2
return (separator + colsep.join(values_with_attrs)).rstrip()


def _escape_mediawiki_value(value, separator):
value = value.replace("|", "|")
if separator == "!":
value = value.replace("!", "!")
return value


def _textile_row_with_attrs(cell_values, colwidths, colaligns):
cell_values[0] += " "
alignment = {"left": "<.", "right": ">.", "center": "=.", "decimal": ">."}
Expand Down
38 changes: 38 additions & 0 deletions test/test_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -2559,6 +2559,44 @@ def test_mediawiki_headerless():
assert_equal(expected, result)


def test_mediawiki_escapes_pipes_in_cells_and_headers():
"Output: mediawiki with literal pipes in cell and header content"
# https://github.com/astanin/python-tabulate/issues/499
expected = "\n".join(
[
'{| class="wikitable" style="text-align: left;"',
"|+ <!-- caption -->",
"|-",
"! h &#124; 1",
"|-",
"| x &#124; y",
"|-",
"| a &#124;&#124; b",
"|}",
]
)
result = tabulate([["x | y"], ["a || b"]], headers=["h | 1"], tablefmt="mediawiki")
assert_equal(expected, result)


def test_mediawiki_escapes_bang_in_headers():
"Output: mediawiki header cells containing double exclamation marks"
# https://github.com/astanin/python-tabulate/issues/499
expected = "\n".join(
[
'{| class="wikitable" style="text-align: left;"',
"|+ <!-- caption -->",
"|-",
"! h &#33;&#33; 1",
"|-",
"| value",
"|}",
]
)
result = tabulate([["value"]], headers=["h !! 1"], tablefmt="mediawiki")
assert_equal(expected, result)


def test_moinmoin():
"Output: moinmoin with headers"
expected = "\n".join(
Expand Down