FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-45666: Use `%S` for MSVC and `%s` elsewhere for `swprintf` in `_testembed.c` by sobolevn · Pull Request #29341 · python/cpython · GitHub

/ cpython Public

bpo-45666: Use %S for MSVC and %s elsewhere for swprintf in _testembed.c - #29341

Merged
Fidget-Spinner merged 4 commits into
python:mainfrom
sobolevn:patch-3
Nov 1, 2021
ConversationCommits (4)ChecksFiles changed
Merged

bpo-45666: Use %S for MSVC and %s elsewhere for swprintf in _testembed.c#29341
Fidget-Spinner merged 4 commits into
python:mainfrom
sobolevn:patch-3

Conversation

sobolevn commented Oct 31, 2021 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

Fidget-Spinner mentioned this pull request Oct 31, 2021
Merged

sobolevn commented Oct 31, 2021

Copy link
Copy Markdown
Member Author

Man: https://man7.org/linux/man-pages/man3/swprintf.3.html

serhiy-storchaka changed the title Change %S -> %ls in swprintf in _testembed.c bpo-45666: Change %S -> %ls in swprintf in _testembed.c Oct 31, 2021
Fidget-Spinner approved these changes Oct 31, 2021
View reviewed changes

Fidget-Spinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I hope I understand the MSVC docs properly.
https://docs.microsoft.com/en-us/cpp/c-runtime-library/format-specification-syntax-printf-and-wprintf-functions?view=msvc-160#size-prefixes-for-printf-and-wprintf-format-type-specifiers

serhiy-storchaka requested changes Oct 31, 2021
View reviewed changes

serhiy-storchaka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

%ls is not applicable here.

One possible solutions is to use %S on Windows and %s on Linux (it should be tested). Or maybe there is a portable way.

bedevere-bot commented Oct 31, 2021

Copy link
Copy Markdown

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

Fidget-Spinner requested changes Oct 31, 2021
View reviewed changes

Fidget-Spinner left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Following Serhiy's suggestion, maybe this is better:

Comment thread Programs/_testembed.c Outdated

serhiy-storchaka commented Oct 31, 2021

Copy link
Copy Markdown
Member

You can also use Py_DecodeLocale() as in other tests.

serhiy-storchaka reviewed Oct 31, 2021
View reviewed changes
Comment thread Programs/_testembed.c Outdated
// bpo-45020: Test that -X "frozen_modules" works.
const char *envvar = getenv("TESTFROZEN");
return check_use_frozen_modules(envvar);
wchar_t *frozen = Py_DecodeLocale(envvar, NULL);

serhiy-storchaka Oct 31, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

If you are going to use Py_DecodeLocale(), you need to check its result for failure, and free the dynamic allocated memory after use. You should also add a special case for getenv() returning NULL.

@Fidget-Spinner's suggestion is much simpler.

sobolevn and others added 2 commits October 31, 2021 16:28
Revert "Let's try to use Py_DecodeLocale"
8d92533 
This reverts commit c67be03.
Update Programs/_testembed.c
0cc5eef 
Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>

sobolevn commented Oct 31, 2021

Copy link
Copy Markdown
Member Author

Thank you @serhiy-storchaka and @Fidget-Spinner for your help! I am coming from Rust background and C is very hard for me! (no borrow checker 😬, you have to remember to deallocate memory!)

But, I will do my best to get used to it 🙂

Fidget-Spinner changed the title bpo-45666: Change %S -> %ls in swprintf in _testembed.c bpo-45666: Use %S for MSVC and %s elsewhere for swprintf in _testembed.c Nov 1, 2021
Fidget-Spinner merged commit 401d25e into python:main Nov 1, 2021

Fidget-Spinner commented Nov 1, 2021

Copy link
Copy Markdown
Member

@sobolevn glad to help. Your comment also reminded me I should seriously try out Rust one day :). I still suck at it.

sobolevn commented Nov 1, 2021

Copy link
Copy Markdown
Member Author

@Fidget-Spinner you can take a look at RustPython project: https://github.com/RustPython/RustPython
I really like it! This was a project that motivated me to contribute to CPython.

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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

serhiy-storchaka serhiy-storchaka approved these changes
Fidget-Spinner Fidget-Spinner approved these changes

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

Back | FazBrowse Home | New Git URL