Skip to content

Distinguish comma delimiter from thousand separator #38

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
leostimpfle wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Distinguish comma delimiter from thousand separator #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d03c0b
Distinguish comma delimter from thousand separator
leostimpfle Mar 15, 2026
9f4b208
Narrow exception
leostimpfle Mar 15, 2026
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
16 changes: 15 additions & 1 deletion src/maketables/etable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,14 @@ def _relabel_index(index, labels=None, stats_labels=None):
return index


def _is_valid_format_spec(spec: str) -> bool:
"""Check if spec is a valid Python format specification."""
try:
format(0.0, spec)
except ValueError:
return False
return True

def _parse_coef_fmt(coef_fmt: str, custom_stats: dict, available_columns: set):
"""
Parse the coef_fmt string with format specifiers and star markers.
Expand Down Expand Up @@ -893,9 +901,15 @@ def _parse_coef_fmt(coef_fmt: str, custom_stats: dict, available_columns: set):
format_start = after_token_pos + 1
format_end = format_start
# Stop at delimiters: space, newline, brackets, backslash, comma, or *
# A comma is allowed when it is a valid grouping option
# (thousands separator) rather than a literal delimiter.
while (
format_end < len(coef_fmt)
and coef_fmt[format_end] not in [" ", "\n", "(", ")", "[", "]", "\\", ",", "*"]
and coef_fmt[format_end] not in [" ", "\n", "(", ")", "[", "]", "\\", "*"]
and (
coef_fmt[format_end] != ","
or _is_valid_format_spec(coef_fmt[format_start:format_end + 1])
)
and not any(
coef_fmt[format_end:].startswith(t) for t in all_tokens
)
Expand Down
Loading