Skip to content

gh-95504: Fix sign placement in PyUnicode_FromFormat - #95505

Closed
philg314 wants to merge 8 commits into
python:mainfrom
philg314:unicode-from-format-negative
Closed

gh-95504: Fix sign placement in PyUnicode_FromFormat#95505
philg314 wants to merge 8 commits into
python:mainfrom
philg314:unicode-from-format-negative

Conversation

@philg314

@philg314philg314 commented Jul 31, 2022

Copy link
Copy Markdown
Contributor

gh-95504: Fix sign placement in PyUnicode_FromFormat

The sign doesn't stick to the number anymore:
PyUnicode_FromFormat("%05d", -123); results in "-0123" instead of "0-123",
PyUnicode_FromFormat("%.5d", -123); results in "-00123" instead of "0-123".

@ghost

ghost commented Jul 31, 2022

Copy link
Copy Markdown

All commit authors signed the Contributor License Agreement.
CLA signed

@methanemethane 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.

LGTM.
But this is bit sensitive to backport because Python 3.11 is right before RC.

@philg314

Copy link
Copy Markdown
ContributorAuthor

I emailed core-mentorship about this on Friday night but didn't wait to hear back before submitting this PR.

@encukou is in the process of splitting _testcapimodule.c up into more manageable pieces (#93649) and has asked me to move Unicode related tests into a separate file. I'll convert this PR to a draft while working on that and convert it back once that's done.

@philg314
philg314 marked this pull request as draft August 1, 2022 15:33
@philg314
philg314 marked this pull request as ready for review August 2, 2022 03:28
@philg314
philg314 requested a review from a team as a code ownerAugust 2, 2022 03:28
@philg314

Copy link
Copy Markdown
ContributorAuthor

@encukou this is ready for review.

@serhiy-storchaka
serhiy-storchaka requested review from serhiy-storchaka and removed request for a teamAugust 7, 2022 08:50

@serhiy-storchakaserhiy-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.

LGTM in general, but I would wait for testcapi refactoring.

Comment threadMisc/ACKS
Comment threadObjects/unicodeobject.c Outdated
Comment on lines +2507 to +2510
if (negative && !zeropad) {
if (_PyUnicodeWriter_WriteChar(writer, '-') == -1)
return NULL;
}

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.

It can be simpler. Instead of writing minus explicitly, you can write it as a part of the buffer.

You will get the same result if remove this if and pass &buffer[negative && zeropad] instead of &buffer[negative] to _PyUnicodeWriter_WriteASCIIString().

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

That wouldn't work with precision: %.5d with -123 would be 00-123.

@encukou

Copy link
Copy Markdown
Member

Sorry for making you do more work, but it works best if the test refactoring is done first, in a separate pull request, so that:

  • the change PR shows what changed in the tests
  • if something goes wrong, the change can be reverted without the refactoring
  • the refactoring can be applied to older unfixed versions, if necessary (e.g. wep only need to backport a subset of changes)

Do you want to split this up? I can also do it, and it wouldn't be too much extra work in addition to a review, but I don't want to “steal your contribution”.

@philg314

Copy link
Copy Markdown
ContributorAuthor

Sorry for making you do more work, but it works best if the test refactoring is done first, in a separate pull request, so that:

  • the change PR shows what changed in the tests
  • something goes wrong, the change can be reverted without the refactoring
  • refactoring can be applied to older unfixed versions, if necessary (e.g. wep only need to backport a subset of changes)

No problem, makes sense.

Do you want to split this up? I can also do it, and it wouldn't be too much extra work in addition to a review, but I don't want to “steal your contribution”.

Sure, and for future reference I'll never have a problem with anything like that. Please ping me when the refactor is merged.

@encukou

Copy link
Copy Markdown
Member

@philg314,
Tests were merged in #95819.
The behavior change is in #95848, could you check everything is in order?

@encukou

Copy link
Copy Markdown
Member

The changes were merged in #95819 and #95848.

Thanks for the contribution, @philg314!

@encukouencukou closed this Aug 10, 2022
@philg314

Copy link
Copy Markdown
ContributorAuthor

Thanks for the reviews @methane and @serhiy-storchaka and thanks for merging @encukou!

@philg314
philg314 deleted the unicode-from-format-negative branch August 10, 2022 14:28
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@philg314@encukou@methane@serhiy-storchaka@bedevere-bot