Skip to content

[3.7] bpo-39152: add missing ttk.Scale.configure return value (GH-17815) #17839

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 1 commit into from
Jan 5, 2020
Merged

[3.7] bpo-39152: add missing ttk.Scale.configure return value (GH-17815) #17839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 4 additions & 9 deletions Lib/tkinter/test/widget_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import unittest
import sys
import tkinter
from tkinter.ttk import Scale
from tkinter.test.support import (AbstractTkTest, tcl_version, requires_tcl,
get_tk_patchlevel, pixels_conv, tcl_obj_eq)
import test.support
Expand Down Expand Up @@ -63,11 +62,9 @@ def checkParam(self, widget, name, value, *, expected=_sentinel,
eq = tcl_obj_eq
self.assertEqual2(widget[name], expected, eq=eq)
self.assertEqual2(widget.cget(name), expected, eq=eq)
# XXX
if not isinstance(widget, Scale):
t = widget.configure(name)
self.assertEqual(len(t), 5)
self.assertEqual2(t[4], expected, eq=eq)
t = widget.configure(name)
self.assertEqual(len(t), 5)
self.assertEqual2(t[4], expected, eq=eq)

def checkInvalidParam(self, widget, name, value, errmsg=None, *,
keep_orig=True):
Expand Down Expand Up @@ -209,9 +206,7 @@ def assertIsBoundingBox(self, bbox):
def test_keys(self):
widget = self.create()
keys = widget.keys()
# XXX
if not isinstance(widget, Scale):
self.assertEqual(sorted(keys), sorted(widget.configure()))
self.assertEqual(sorted(keys), sorted(widget.configure()))
for k in keys:
widget[k]
# Test if OPTIONS contains all keys
Expand Down
5 changes: 3 additions & 2 deletions Lib/tkinter/ttk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,11 +1086,12 @@ def configure(self, cnf=None, **kw):

Setting a value for any of the "from", "from_" or "to" options
generates a <<RangeChanged>> event."""
if cnf:
retval = Widget.configure(self, cnf, **kw)
if not isinstance(cnf, (type(None), str)):
kw.update(cnf)
Widget.configure(self, **kw)
if any(['from' in kw, 'from_' in kw, 'to' in kw]):
self.event_generate('<<RangeChanged>>')
return retval


def get(self, x=None, y=None):
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2020-01-03-18-02-50.bpo-39152.JgPjCC.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix ttk.Scale.configure([name]) to return configuration tuple for name
or all options. Giovanni Lombardo contributed part of the patch.