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

Commit4413f2e

Browse files
miss-islingtonDBJimserhiy-storchakahugovk
authored
[3.10]gh-107262: Update Tkinter tests for Tcl/Tk 8.6.14 (GH-119322) (#130274)
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 parentd09105c commit4413f2e

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
@@ -227,7 +227,7 @@ jobs:
227227
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
228228
-name:'Restore OpenSSL build'
229229
id:cache-openssl
230-
uses:actions/cache@v3.0.2
230+
uses:actions/cache@v4
231231
with:
232232
path:./multissl/openssl/${{ env.OPENSSL_VER }}
233233
key:${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -275,7 +275,7 @@ jobs:
275275
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
276276
-name:'Restore OpenSSL build'
277277
id:cache-openssl
278-
uses:actions/cache@v3
278+
uses:actions/cache@v4
279279
with:
280280
path:./multissl/openssl/${{ env.OPENSSL_VER }}
281281
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
@@ -676,7 +676,9 @@ def test_configure_tabs(self):
676676
else:
677677
self.checkParam(widget,'tabs', (10.2,20.7,'1i','2i'))
678678
self.checkParam(widget,'tabs','10.2 20.7 1i 2i',
679-
expected=('10.2','20.7','1i','2i'))
679+
expected=(10.2,20.7,'1i','2i')
680+
ifget_tk_patchlevel()>= (8,6,14)
681+
else ('10.2','20.7','1i','2i'))
680682
self.checkParam(widget,'tabs','2c left 4c 6c center',
681683
expected=('2c','left','4c','6c','center'))
682684
self.checkInvalidParam(widget,'tabs','spam',
@@ -1014,12 +1016,16 @@ def test_itemconfigure(self):
10141016
widget.itemconfigure()
10151017
withself.assertRaisesRegex(TclError,'bad listbox index "red"'):
10161018
widget.itemconfigure('red')
1019+
ifget_tk_patchlevel()>= (8,6,14):
1020+
prefix= ('background','','','')
1021+
else:
1022+
prefix= ('background','background','Background','')
10171023
self.assertEqual(widget.itemconfigure(0,'background'),
1018-
('background','background','Background','','red'))
1024+
(*prefix,'red'))
10191025
self.assertEqual(widget.itemconfigure('end','background'),
1020-
('background','background','Background','','violet'))
1026+
(*prefix,'violet'))
10211027
self.assertEqual(widget.itemconfigure('@0,0','background'),
1022-
('background','background','Background','','red'))
1028+
(*prefix,'red'))
10231029

10241030
d=widget.itemconfigure(0)
10251031
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