Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
2028e013
Commit
2028e013
authored
Nov 04, 2013
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #19085: Fix running test_ttk_textonly on displayless host.
parent
8d8599ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
9 deletions
+16
-9
Lib/tkinter/test/test_tkinter/test_widgets.py
Lib/tkinter/test/test_tkinter/test_widgets.py
+3
-2
Lib/tkinter/test/widget_tests.py
Lib/tkinter/test/widget_tests.py
+13
-7
No files found.
Lib/tkinter/test/test_tkinter/test_widgets.py
View file @
2028e013
...
...
@@ -4,7 +4,8 @@ import os
from
test.support
import
requires
from
tkinter.test.support
import
tcl_version
,
requires_tcl
,
widget_eq
from
tkinter.test.widget_tests
import
(
add_standard_options
,
noconv
,
from
tkinter.test.widget_tests
import
(
add_standard_options
,
noconv
,
pixels_round
,
AbstractWidgetTest
,
StandardOptionsTests
,
IntegerSizeTests
,
PixelSizeTests
)
requires
(
'gui'
)
...
...
@@ -243,7 +244,7 @@ class MenubuttonTest(AbstractLabelTest, unittest.TestCase):
'takefocus'
,
'text'
,
'textvariable'
,
'underline'
,
'width'
,
'wraplength'
,
)
_conv_pixels
=
AbstractWidgetTest
.
_conv_pixels
_conv_pixels
=
staticmethod
(
pixels_round
)
def
_create
(
self
,
**
kwargs
):
return
tkinter
.
Menubutton
(
self
.
root
,
**
kwargs
)
...
...
Lib/tkinter/test/widget_tests.py
View file @
2028e013
...
...
@@ -12,18 +12,24 @@ pixels_round = round
if
tcl_version
[:
2
]
==
(
8
,
5
):
# Issue #19085: Workaround a bug in Tk
# http://core.tcl.tk/tk/info/3497848
root
=
setup_master
()
patchlevel
=
root
.
call
(
'info'
,
'patchlevel'
)
patchlevel
=
tuple
(
map
(
int
,
patchlevel
.
split
(
'.'
)))
if
patchlevel
<
(
8
,
5
,
12
):
pixels_round
=
int
del
root
_pixels_round
=
None
def
pixels_round
(
x
):
global
_pixels_round
if
_pixels_round
is
None
:
root
=
setup_master
()
patchlevel
=
root
.
call
(
'info'
,
'patchlevel'
)
patchlevel
=
tuple
(
map
(
int
,
patchlevel
.
split
(
'.'
)))
if
patchlevel
<
(
8
,
5
,
12
):
_pixels_round
=
int
else
:
_pixels_round
=
int_round
return
_pixels_round
(
x
)
_sentinel
=
object
()
class
AbstractWidgetTest
:
_conv_pixels
=
pixels_round
_conv_pixels
=
staticmethod
(
pixels_round
)
_conv_pad_pixels
=
None
wantobjects
=
True
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment