Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit61746a3

Browse files
miss-islingtonDBJimserhiy-storchakahugovk
authored
[3.9]gh-107262: Update Tkinter tests for Tcl/Tk 8.6.14 (GH-119322) (#130275)
Co-authored-by: James De Bias <81095953+DBJim@users.noreply.github.com>Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
1 parentfe6c43e commit61746a3

File tree

3 files changed

+24
-11
lines changed

3 files changed

+24
-11
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ jobs:
200200
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
201201
-name:'Restore OpenSSL build'
202202
id:cache-openssl
203-
uses:actions/cache@v3.0.2
203+
uses:actions/cache@v4
204204
with:
205205
path:./multissl/openssl/${{ env.OPENSSL_VER }}
206206
key:${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -246,7 +246,7 @@ jobs:
246246
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
247247
-name:'Restore OpenSSL build'
248248
id:cache-openssl
249-
uses:actions/cache@v3
249+
uses:actions/cache@v4
250250
with:
251251
path:./multissl/openssl/${{ env.OPENSSL_VER }}
252252
key:${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}

‎Lib/tkinter/test/test_tkinter/test_widgets.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,9 @@ def test_configure_tabs(self):
650650
else:
651651
self.checkParam(widget,'tabs', (10.2,20.7,'1i','2i'))
652652
self.checkParam(widget,'tabs','10.2 20.7 1i 2i',
653-
expected=('10.2','20.7','1i','2i'))
653+
expected=(10.2,20.7,'1i','2i')
654+
ifget_tk_patchlevel()>= (8,6,14)
655+
else ('10.2','20.7','1i','2i'))
654656
self.checkParam(widget,'tabs','2c left 4c 6c center',
655657
expected=('2c','left','4c','6c','center'))
656658
self.checkInvalidParam(widget,'tabs','spam',
@@ -830,12 +832,16 @@ def test_itemconfigure(self):
830832
widget.itemconfigure()
831833
withself.assertRaisesRegex(TclError,'bad listbox index "red"'):
832834
widget.itemconfigure('red')
835+
ifget_tk_patchlevel()>= (8,6,14):
836+
prefix= ('background','','','')
837+
else:
838+
prefix= ('background','background','Background','')
833839
self.assertEqual(widget.itemconfigure(0,'background'),
834-
('background','background','Background','','red'))
840+
(*prefix,'red'))
835841
self.assertEqual(widget.itemconfigure('end','background'),
836-
('background','background','Background','','violet'))
842+
(*prefix,'violet'))
837843
self.assertEqual(widget.itemconfigure('@0,0','background'),
838-
('background','background','Background','','red'))
844+
(*prefix,'red'))
839845

840846
d=widget.itemconfigure(0)
841847
self.assertIsInstance(d,dict)

‎Lib/tkinter/test/test_ttk/test_widgets.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,20 @@ def test_configure_class(self):
2828

2929
deftest_configure_padding(self):
3030
widget=self.create()
31-
self.checkParam(widget,'padding',0,expected=('0',))
32-
self.checkParam(widget,'padding',5,expected=('5',))
33-
self.checkParam(widget,'padding', (5,6),expected=('5','6'))
31+
ifget_tk_patchlevel()< (8,6,14):
32+
defpadding_conv(value):
33+
self.assertIsInstance(value,tuple)
34+
returntuple(map(str,value))
35+
else:
36+
padding_conv=None
37+
self.checkParam(widget,'padding',0,expected=(0,),conv=padding_conv)
38+
self.checkParam(widget,'padding',5,expected=(5,),conv=padding_conv)
39+
self.checkParam(widget,'padding', (5,6),
40+
expected=(5,6),conv=padding_conv)
3441
self.checkParam(widget,'padding', (5,6,7),
35-
expected=('5','6','7'))
42+
expected=(5,6,7),conv=padding_conv)
3643
self.checkParam(widget,'padding', (5,6,7,8),
37-
expected=('5','6','7','8'))
44+
expected=(5,6,7,8),conv=padding_conv)
3845
self.checkParam(widget,'padding', ('5p','6p','7p','8p'))
3946
self.checkParam(widget,'padding', (),expected='')
4047

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp