Scons : Make encoding check more flexible #5409
Merged
Conversation
This file contains 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
ericmehl
changed the title
johnhaddon
reviewed
Aug 3, 2023
SConstruct
Outdated
| @@ -48,7 +48,7 @@ import distutils.dir_util | |||
|
|
|||
| EnsureSConsVersion( 3, 0, 2 ) # Substfile is a default builder as of 3.0.2 | |||
|
|
|||
| if locale.getpreferredencoding() != "UTF-8" : | |||
| if locale.getpreferredencoding().upper() != "UTF-8" : | |||
There was a problem hiding this comment.
I don't know if it matters or not, but I think codecs.lookup( locale.getpreferredencoding() ).name is the official way to get a canonical encoding name, so might be better than using upper()?
johnhaddon
approved these changes
Aug 8, 2023
|
Thanks for the tip! You beat me to approval before I could message about the update :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
After upgrading my system Python to 3.11.4 I found that it reports my encoding as
utf-8instead ofUTF-8.I don't know if this really qualifies as a bug fix, but I figured it will be better to get it early in the current chain than later. Happy to retarget to 1.3 if that's desirable.
Checklist