summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter/test
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2020-01-05 16:23:58 (GMT)
committerGitHub <noreply@github.com>2020-01-05 16:23:58 (GMT)
commit5ea7bb25e3b192d6c49a49c9e3b316f8559602aa (patch)
tree9223773683bcf2c6c4f8b533b19eefc30719b986 /Lib/tkinter/test
parentb19c0d77e6f25ea831ab608c71f15d0d9266c8c4 (diff)
downloadcpython-5ea7bb25e3b192d6c49a49c9e3b316f8559602aa.zip
cpython-5ea7bb25e3b192d6c49a49c9e3b316f8559602aa.tar.gz
cpython-5ea7bb25e3b192d6c49a49c9e3b316f8559602aa.tar.bz2
bpo-39152: add missing ttk.Scale.configure return value (GH-17815)
tkinter.ttk.Scale().configure([name]) now returns a configuration tuple for name or a list thereof for all options. Based on patch Giovanni Lombardo.
Diffstat (limited to 'Lib/tkinter/test')
-rw-r--r--Lib/tkinter/test/widget_tests.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/Lib/tkinter/test/widget_tests.py b/Lib/tkinter/test/widget_tests.py
index 75a068f..b42ff52 100644
--- a/Lib/tkinter/test/widget_tests.py
+++ b/Lib/tkinter/test/widget_tests.py
@@ -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
@@ -63,11 +62,9 @@ class AbstractWidgetTest(AbstractTkTest):
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):
@@ -209,9 +206,7 @@ class AbstractWidgetTest(AbstractTkTest):
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