Skip to content

bpo-41851: tkinter font add neg and equal methods #22396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
E-Paine wants to merge 7 commits into from
Closed

bpo-41851: tkinter font add neg and equal methods #22396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a7bf556
Add neg and equal methods (+ tests)
E-Paine Sep 24, 2020
3ee84dd
Add doc for new methods
E-Paine Sep 24, 2020
f04f408
Doc versionadded
E-Paine Sep 24, 2020
3c07af6
📜🤖 Added by blurb_it.
blurb-it[bot] Sep 24, 2020
4e8bbde
Remove doc trailing whitespace
E-Paine Sep 24, 2020
0b43e84
Resolve @gareth-rees' comments
E-Paine Sep 24, 2020
52cb626
Remove neg method additions
E-Paine Sep 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Doc/library/tkinter.font.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ The different font weights and slants are:

Return new instance of the current font.

.. method:: equal(other)

Compare the font to another and check if they represent the same font (in
contrast to :meth:`__eq__`, which checks if they are the same Tk object).

.. versionadded:: 3.10

.. method:: measure(text, displayof=None)

Return amount of space the text would occupy on the specified display
Expand Down Expand Up @@ -93,4 +100,4 @@ The different font weights and slants are:

.. function:: nametofont(name)

Return a :class:`Font` representation of a tk named font.
Return a :class:`Font` representation of a tk named font.
5 changes: 5 additions & 0 deletions Lib/tkinter/font.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ def config(self, **options):

configure = config

def equal(self, other):
if not isinstance(other, Font):
raise TypeError("Value for comparison must also be a Font")
return self.actual() == other.actual()

def measure(self, text, displayof=None):
"Return text width"
args = (text,)
Expand Down
12 changes: 12 additions & 0 deletions Lib/tkinter/test/test_tkinter/test_font.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@ def test_eq(self):
self.assertNotEqual(font1, 0)
self.assertEqual(font1, ALWAYS_EQ)

def test_equal(self):
font1 = font.Font(root=self.root, size=32)
font2 = font1.copy()
self.assertTrue(font1.equal(font2))
self.assertTrue(font2.equal(font1))
font2['size'] = 30
self.assertFalse(font1.equal(font2))
font3 = font.Font(root=self.root, size=30, underline=True)
self.assertFalse(font2.equal(font3))
font2['underline'] = True
self.assertTrue(font2.equal(font3))

def test_measure(self):
self.assertIsInstance(self.font.measure('abc'), int)

Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2020-09-24-11-29-21.bpo-41851.JpgrR4.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add :meth:`equal` method to tkinter font class