Allow int for truncation_limit_lines and truncation_limit_chars in TOML#14692
Open
Pierre-Sassoulas wants to merge 2 commits into
Open
Allow int for truncation_limit_lines and truncation_limit_chars in TOML#14692Pierre-Sassoulas wants to merge 2 commits into
truncation_limit_lines and truncation_limit_chars in TOML#14692Pierre-Sassoulas wants to merge 2 commits into
Conversation
psf-chronographer
Bot
added
the
bot:chronographer:provided
bluetech
requested changes
Jul 9, 2026
bluetech
left a comment
bluetech
left a comment
Member
There was a problem hiding this comment.
We can't just change to int, as that would be a breaking change. We need to allow both, unfortunately.
I will write in the issue how I think we can do it.
Pierre-Sassoulas
force-pushed
the
fix-truncation-limit-int-14675
branch
2 times, most recently
from
7706185 to
6cf3e85
Compare
addini now accepts a tuple of the existing type tags, e.g.
type=("int", "string"), meaning the option accepts a value of any of
those types. getini tries each tag in order and returns the first that
accepts the value: in TOML config the native value may be of any member
type, and string-based formats (INI files, -o overrides) coerce it to
the first member that accepts it.
This reuses the existing per-tag coercion, and single-tag registration is
unchanged (its original error is re-raised as-is).
The truncation_limit_lines and truncation_limit_chars options were registered without a type (defaulting to 'string'), so integer values in native TOML config raised a TypeError (pytest-dev#14675). They are now registered with type=('int', 'string'), accepting both int and string values in TOML while keeping the string form working for backward compatibility. TruncationBudget.from_config reads the two options and owns default handling: None (option unset) falls back to the DEFAULT_MAX_* limits, which live next to the class; other values are coerced with int(). truncate_if_required short-circuits on verbosity/CI before reading the options at all. 0 still means 'unbounded'; None means 'use default'. Fixes pytest-dev#14675
Pierre-Sassoulas
force-pushed
the
fix-truncation-limit-int-14675
branch
from
4010bfd to
007af70
Compare
nicoddemus
approved these changes
Jul 10, 2026
nicoddemus
left a comment
nicoddemus
left a comment
Member
There was a problem hiding this comment.
Overall nice work.
It is different than the original proposal of using the types directly (str | int vs ("str", "int")), but I suspect this is good enough and aligns well with the original API.
| #: a value of any of these types" (e.g. ``("int", "string")``). | ||
| IniType = _IniTypeTag | tuple[_IniTypeTag, ...] | ||
|
|
||
| _INI_TYPE_TAGS: tuple[str, ...] = ( |
Member
There was a problem hiding this comment.
Suggested change
| _INI_TYPE_TAGS: tuple[str, ...] = ( | |
| #: Runtime list tags accepted by :meth:`Parser.addini` for its ``type`` argument. | |
| #: Keep in sync with _IniTypeTag. | |
| _INI_TYPE_TAGS: tuple[str, ...] = ( |
|
|
||
| FILE_OR_DIR = "file_or_dir" | ||
|
|
||
| #: The string tags accepted by :meth:`Parser.addini` for its ``type`` argument. |
Member
There was a problem hiding this comment.
Suggested change
| #: The string tags accepted by :meth:`Parser.addini` for its ``type`` argument. | |
| #: The string tags accepted by :meth:`Parser.addini` for its ``type`` argument. | |
| #: Keep in sync with _INI_TYPE_TAGS. |
| if type is None: | ||
| type = "string" | ||
| tags = type if isinstance(type, tuple) else (type,) | ||
| assert tags and all(tag in _INI_TYPE_TAGS for tag in tags), type |
Member
There was a problem hiding this comment.
We probably should use an exception here, given this might be an user-provided value.
asserts should be used for internal checks/consistency only.
| if type in ("paths", "pathlist", "args", "linelist"): | ||
| if isinstance(type, tuple): | ||
| # A union has no unambiguous implicit default; require an explicit one. | ||
| return None |
Member
There was a problem hiding this comment.
IIUC, None will be used as default, contrary to the comment. Perhaps raise an exception instead?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The truncation_limit_lines and truncation_limit_chars ini options were registered without a type, defaulting to 'string'. In native TOML config ([tool.pytest]), integer values then raised a TypeError instead of being accepted, despite being numeric limits.
Register both options with type='int' so TOML integer values are accepted (INI string values keep working via the existing int coercion).
Basically #14689 but without unwanted AI to human conversation.
Fixes #14675