mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #24408: Fixed AttributeError in measure() and metrics() methods of

Browse source 
tkinter.Font.
This commit is contained in:
Serhiy Storchaka 2015-06-08 18:43:55 +03:00
parent 391af751f2
commit 4fafda731a
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/tkinter/font.py
View file

@ -151,7 +151,7 @@ class Font:
args = (text,) args = (text,)
if displayof: if displayof:
args = ('-displayof', displayof, text) args = ('-displayof', displayof, text)
return self._root.tk.getint(self._call("font", "measure", self.name, *args)) return self._tk.getint(self._call("font", "measure", self.name, *args))
def metrics(self, *options, **kw): def metrics(self, *options, **kw):
"""Return font metrics. """Return font metrics.
@ -164,13 +164,13 @@ class Font:
args = ('-displayof', displayof) args = ('-displayof', displayof)
if options: if options:
args = args + self._get(options) args = args + self._get(options)
return self._root.tk.getint( return self._tk.getint(
self._call("font", "metrics", self.name, *args)) self._call("font", "metrics", self.name, *args))
else: else:
res = self._split(self._call("font", "metrics", self.name, *args)) res = self._split(self._call("font", "metrics", self.name, *args))
options = {} options = {}
for i in range(0, len(res), 2): for i in range(0, len(res), 2):
options[res[i][1:]] = self._root.tk.getint(res[i+1]) options[res[i][1:]] = self._tk.getint(res[i+1])
return options return options

3
Misc/NEWS
View file

@ -15,6 +15,9 @@ Core and Builtins
Library Library
------- -------
- Issue #24408: Fixed AttributeError in measure() and metrics() methods of
tkinter.Font.
- Issue #14373: C implementation of functools.lru_cache() now can be used with - Issue #14373: C implementation of functools.lru_cache() now can be used with
methods. methods.