Skip to content

Commit

Permalink
minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
cgevans committed Jul 20, 2022
1 parent d299752 commit 6f3ac87
Showing 1 changed file with 25 additions and 14 deletions.
39 changes: 25 additions & 14 deletions src/alhambra_mixes/mixes.py
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,13 @@ def _format_error_span(out, tablefmt):
return f"**{out}**"


_NL = {
"pipe": "\n",
"html": "<br/>",
"unsafehtml": "<br/>",
}


def _formatter(
x: int | float | str | list[str] | Quantity[Decimal] | None,
italic: bool = False,
Expand All @@ -541,9 +548,12 @@ def _formatter(
out = f"{x:,.2f~#P}"
if math.isnan(x.m):
out = _format_error_span(out, tablefmt)
if x.m < 0:
out = _format_error_span(out, tablefmt)
elif isinstance(x, (list, np.ndarray, pd.Series)):
out = ", ".join(
("\n" if i - 1 in splits else "") + _formatter(y) for i, y in enumerate(x)
(_NL[tablefmt] if i - 1 in splits else "") + _formatter(y)
for i, y in enumerate(x)
)
else:
raise TypeError
Expand Down Expand Up @@ -1843,19 +1853,20 @@ def table(

include_numbers = any(ml.number != 1 for ml in mixlines)

return (
_format_errors(validation_errors, tablefmt)
+ "\n"
+ tabulate(
[ml.toline(include_numbers, tablefmt=tablefmt) for ml in mixlines],
MIXHEAD_EA if include_numbers else MIXHEAD_NO_EA,
tablefmt=tablefmt,
stralign=stralign,
missingval=missingval,
showindex=showindex,
disable_numparse=disable_numparse,
colalign=colalign,
)
if validation_errors:
errline = _format_errors(validation_errors, tablefmt) + "\n"
else:
errline = ""

return errline + tabulate(
[ml.toline(include_numbers, tablefmt=tablefmt) for ml in mixlines],
MIXHEAD_EA if include_numbers else MIXHEAD_NO_EA,
tablefmt=tablefmt,
stralign=stralign,
missingval=missingval,
showindex=showindex,
disable_numparse=disable_numparse,
colalign=colalign,
)

def mixlines(
Expand Down

0 comments on commit 6f3ac87

Please sign in to comment.