Adjusts salt.utils.stringutils.is_binary detection #68457
+202
−41
Conversation
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
- Deduplicates binary or text detection in utils.files.is_text and utils.stringutils.is_binary - Updates utils.files.is_text and utils.files.is_binary to use the utils.stringutils.is_binary to do the text or binary identification.
twangboy
previously approved these changes
Nov 13, 2025
This was
linked to
issues
Nov 13, 2025
bdrx312
reviewed
Nov 15, 2025
- Define `text_characters` only when it will be used - Adds commentaries about the `text_characters` definition - Fix a corner case if a utf-8 multibyte character is truncated and more than 30% of the byte array have values between 1 and 31.
piterpunk
force-pushed
the
fix_text_and_binary_detection_3007.x
branch
from
9a3d882 to
1f128a1
Compare
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.
What does this PR do?
salt.utils.files.is_textandsalt.utils.stringutils.is_binarysalt.utils.files.is_textandsalt.utils.files.is_binaryto use thesalt.utils.stringutils.is_binaryto do the text or binary identification.What issues does this PR fix or reference?
Fixes #66706
Fixes #62214
Previous Behavior
The
salt.utils.files.is_textandsalt.utils.files.is_binaryboth gives false results when an utf-8 multibyte character is truncated. Different heuristics between the two modules also gives inconsistent results between the two methods.New Behavior
salt.utils.files.is_textandsalt.utils.files.is_binarynow uses thesalt.utils.stringutils.is_binaryto find if the given file is text or binary. Also, the detection was changed to accept truncated utf-8 multibyte characters.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
No