Commite37d606

authored and

committed

bpo-45979: Fix Tkinter tests with old Tk (>= 8.5.12) (pythonGH-31938)

(cherry picked from commitdbbe4d2)Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

1 parent0b5f99a commite37d606Copy full SHA for e37d606

File tree

-3

lines changed

Lib/tkinter/test
- test_tkinter
  - test_widgets.py
- test_ttk
  - test_style.py

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -800,7 +800,7 @@ def test_configure_activestyle(self):`
`800`	`800`	`self.checkEnumParam(widget,'activestyle',`
`801`	`801`	`'dotbox','none','underline')`
`802`	`802`
`803`		`-test_justify=requires_tcl(8,6,5)(StandardOptionsTests.test_configure_justify)`
	`803`	`+test_configure_justify=requires_tcl(8,6,5)(StandardOptionsTests.test_configure_justify)`
`804`	`804`
`805`	`805`	`deftest_configure_listvariable(self):`
`806`	`806`	`widget=self.create()`
`@@ -939,7 +939,7 @@ def test_configure_digits(self):`
`939`	`939`
`940`	`940`	`deftest_configure_from(self):`
`941`	`941`	`widget=self.create()`
`942`		`-conv=Falseifget_tk_patchlevel()>= (8,6,10)elsefloat_round`
	`942`	`+conv=floatifget_tk_patchlevel()>= (8,6,10)elsefloat_round`
`943`	`943`	`self.checkFloatParam(widget,'from',100,14.9,15.1,conv=conv)`
`944`	`944`
`945`	`945`	`deftest_configure_label(self):`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`fromtkinterimportttk`
`5`	`5`	`fromtestimportsupport`
`6`	`6`	`fromtest.supportimportrequires`
`7`		`-fromtkinter.test.supportimportAbstractTkTest`
	`7`	`+fromtkinter.test.supportimportAbstractTkTest,get_tk_patchlevel`
`8`	`8`
`9`	`9`	`requires('gui')`
`10`	`10`
`@@ -170,6 +170,8 @@ def test_map_custom_copy(self):`
`170`	`170`	`newname=f'C.{name}'`
`171`	`171`	`self.assertEqual(style.map(newname), {})`
`172`	`172`	`style.map(newname,**default)`
	`173`	`+iftheme=='alt'andname=='.'andget_tk_patchlevel()< (8,6,1):`
	`174`	`+default['embossed']= [('disabled','1')]`
`173`	`175`	`self.assertEqual(style.map(newname),default)`
`174`	`176`	`forkey,valueindefault.items():`
`175`	`177`	`self.assertEqual(style.map(newname,key),value)`

Comments

(0)