Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.7] bpo-41306: Allow scale value to not be rounded (GH-21715) #96484

Merged
merged 1 commit into from Sep 1, 2022

Conversation

miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Sep 1, 2022

This fixes the test failure with Tk 6.8.10 which is caused by changes to how Tk rounds the from, to and tickinterval arguments. This PR uses noconv if the patchlevel is greater than or equal to 8.6.10 (credit to Serhiy for this idea as it is much simpler than what I previously proposed).

Going into more detail for those who want it, the Tk change was made in commit 591f68c and means that the arguments listed above are rounded relative to the value of from. However, when rounding the from argument (line 623), it is rounded relative to itself (i.e. rounding 0) and therefore the assigned value for from is always what is given (no matter what values of from and resolution).

Automerge-Triggered-By: @pablogsal
(cherry picked from commit aecf036)

Co-authored-by: E-Paine 63801254+E-Paine@users.noreply.github.com

This fixes the test failure with Tk 6.8.10 which is caused by changes to how Tk rounds the `from`, `to` and `tickinterval` arguments. This PR uses `noconv` if the patchlevel is greater than or equal to 8.6.10 (credit to Serhiy for this idea as it is much simpler than what I previously proposed).

Going into more detail for those who want it, the Tk change was made in [commit 591f68c](tcltk/tk@591f68c) and means that the arguments listed above are rounded relative to the value of `from`. However, when rounding the `from` argument ([line 623](https://github.com/tcltk/tk/blob/591f68cb382525b72664c6fecaab87742b6cc87a/generic/tkScale.cGH-L623)), it is rounded relative to itself (i.e. rounding `0`) and therefore the assigned value for `from` is always what is given (no matter what values of `from` and `resolution`).

Automerge-Triggered-By: @pablogsal
(cherry picked from commit aecf036)

Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>
@miss-islington
Copy link
Contributor Author

miss-islington commented Sep 1, 2022

Status check is done, and it's a success .

@bedevere-bot bedevere-bot added the tests Tests in the Lib/test dir label Sep 1, 2022
@gpshead gpshead requested a review from ned-deily Sep 1, 2022
@gpshead
Copy link
Member

gpshead commented Sep 1, 2022

This should fix a test failure that is blocking CI on the 3.7 branch. (await CI results to find out)

@miss-islington
Copy link
Contributor Author

miss-islington commented Sep 1, 2022

Status check is done, and it's a success .

@miss-islington
Copy link
Contributor Author

miss-islington commented Sep 1, 2022

Sorry, I can't merge this PR. Reason: You're not authorized to push to this branch. Visit https://docs.github.com/articles/about-protected-branches/ for more information..

@ned-deily ned-deily merged commit bb8e49b into python:3.7 Sep 1, 2022
10 checks passed
@miss-islington miss-islington deleted the backport-aecf036-3.7 branch Sep 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tests Tests in the Lib/test dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants