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
186f6654
Commit
186f6654
authored
Jul 24, 2014
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #1730136: Fix comparison between a tk Font object and an object of a
different type.
parent
63a47478
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
1 deletion
+39
-1
Lib/lib-tk/test/test_tkinter/test_font.py
Lib/lib-tk/test/test_tkinter/test_font.py
+35
-0
Lib/lib-tk/tkFont.py
Lib/lib-tk/tkFont.py
+1
-1
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/lib-tk/test/test_tkinter/test_font.py
0 → 100644
View file @
186f6654
import
unittest
import
Tkinter
#from Tkinter
import
tkFont
as
font
from
test.test_support
import
requires
,
run_unittest
import
test_ttk.support
as
support
requires
(
'gui'
)
class
FontTest
(
unittest
.
TestCase
):
def
setUp
(
self
):
support
.
root_deiconify
()
def
tearDown
(
self
):
support
.
root_withdraw
()
def
test_font_eq
(
self
):
fontname
=
"TkDefaultFont"
try
:
f
=
font
.
Font
(
name
=
fontname
,
exists
=
True
)
except
tkinter
.
_tkinter
.
TclError
:
f
=
font
.
Font
(
name
=
fontname
,
exists
=
False
)
font1
=
font
.
nametofont
(
fontname
)
font2
=
font
.
nametofont
(
fontname
)
self
.
assertIsNot
(
font1
,
font2
)
self
.
assertEqual
(
font1
,
font2
)
self
.
assertNotEqual
(
font1
,
font1
.
copy
())
self
.
assertNotEqual
(
font1
,
0
)
self
.
assertNotIn
(
font1
,
[
0
])
tests_gui
=
(
FontTest
,
)
if
__name__
==
"__main__"
:
run_unittest
(
*
tests_gui
)
Lib/lib-tk/tkFont.py
View file @
186f6654
...
...
@@ -97,7 +97,7 @@ class Font:
return
self
.
name
def
__eq__
(
self
,
other
):
return
self
.
name
==
other
.
name
and
isinstance
(
other
,
Font
)
return
isinstance
(
other
,
Font
)
and
self
.
name
==
other
.
name
def
__getitem__
(
self
,
key
):
return
self
.
cget
(
key
)
...
...
Misc/NEWS
View file @
186f6654
...
...
@@ -13,6 +13,9 @@ Core and Builtins
Library
-------
- Issue #1730136: Fix the comparison between a tkFont.Font and an object of
another kind.
- Issue #19884: readline: Disable the meta modifier key if stdout is not
a terminal to not write the ANSI sequence "\033[1034h" into stdout. This
sequence is used on some terminal (ex: TERM=xterm-256color") to enable
...
...
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