Skip to content

bpo-41306: Allow scale value to not be rounded #21715

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.

Sign up for GitHub

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

Merged
miss-islington merged 9 commits into from
Oct 8, 2020
Merged

bpo-41306: Allow scale value to not be rounded #21715

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c8759c
Allow scale value to not be rounded
E-Paine Aug 3, 2020
fc07de8
Reverted 'allow_not_rounded' changes and action Serhiy's recommendation
E-Paine Aug 3, 2020
e184ad8
📜🤖 Added by blurb_it.
blurb-it[bot] Aug 3, 2020
bdd3cb5
Put "conv" kwarg on new line
E-Paine Aug 3, 2020
a8ac6bd
Merge 'master' into test_from
E-Paine Sep 17, 2020
8b8060e
Use @terryjreedy's conv kwarg suggestion
E-Paine Sep 26, 2020
3f9147a
Update Misc/NEWS.d/next/Tests/2020-08-03-13-44-37.bpo-41306.VDoWXI.rst
pablogsal Oct 8, 2020
42ec16e
Update Lib/tkinter/test/test_tkinter/test_widgets.py
pablogsal Oct 8, 2020
e3403c0
Update Lib/tkinter/test/test_tkinter/test_widgets.py
pablogsal Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Reverted 'allow_not_rounded' changes and action Serhiy's recommendation
  • Loading branch information
@E-Paine
E-Paine committed Aug 3, 2020
commit fc07de802f399c89d0fe89d52aff7cb8b8f36fe1
3 changes: 2 additions & 1 deletion Lib/tkinter/test/test_tkinter/test_widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,8 @@ def test_digits(self):

def test_from(self):
widget = self.create()
self.checkFloatParam(widget, 'from', 100, 14.9, 15.1, conv=float_round, allow_not_rounded=True)
# A change in Tk 8.6.10 means `from` is not rounded (bpo-41306)
Comment thread
E-Paine marked this conversation as resolved.
Outdated
self.checkFloatParam(widget, 'from', 100, 14.9, 15.1, conv=float_round if get_tk_patchlevel() < (8, 6, 10) else noconv)

def test_label(self):
widget = self.create()
Expand Down
10 changes: 2 additions & 8 deletions Lib/tkinter/test/widget_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,9 @@ def checkIntegerParam(self, widget, name, *values, **kwargs):
self.checkInvalidParam(widget, name, 3.2,
errmsg='expected integer but got "3.2"')

def checkFloatParam(self, widget, name, *values, conv=float, allow_not_rounded=False, **kwargs):
def checkFloatParam(self, widget, name, *values, conv=float, **kwargs):
for value in values:
try:
self.checkParam(widget, name, value, conv=conv, **kwargs)
except AssertionError:
if allow_not_rounded:
self.checkParam(widget, name, value, conv=lambda val: val, **kwargs)
else:
raise
self.checkParam(widget, name, value, conv=conv, **kwargs)
self.checkInvalidParam(widget, name, '',
errmsg='expected floating-point number but got ""')
self.checkInvalidParam(widget, name, 'spam',
Expand Down