From c8b4791d9e632cd0f05f1441ab2fe2749402f6f7 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 30 Jul 1996 16:31:32 +0000 Subject: [PATCH] Two independent changes: - accept empty string from focus_get - map coords() return value through getdouble and splitlist --- Lib/lib-tk/Tkinter.py | 5 +++-- Lib/tkinter/Tkinter.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py index ac814a96a24..0cff594cfab 100644 --- a/Lib/lib-tk/Tkinter.py +++ b/Lib/lib-tk/Tkinter.py @@ -167,7 +167,7 @@ class Misc: self.tk.call('focus', 'none') def focus_get(self): name = self.tk.call('focus') - if name == 'none': return None + if name == 'none' or not Name: return None return self._nametowidget(name) def tk_focusNext(self): name = self.tk.call('tk_focusNext', self._w) @@ -963,7 +963,8 @@ class Canvas(Widget): return self.tk.getdouble(self.tk.call( self._w, 'canvasy', screeny, gridspacing)) def coords(self, *args): - return self._do('coords', args) + return map(self.tk.getdouble, + self.tk.splitlist(self._do('coords', args)) def _create(self, itemType, args, kw): # Args: (val, val, ..., cnf={}) args = _flatten(args) cnf = args[-1] diff --git a/Lib/tkinter/Tkinter.py b/Lib/tkinter/Tkinter.py index ac814a96a24..0cff594cfab 100755 --- a/Lib/tkinter/Tkinter.py +++ b/Lib/tkinter/Tkinter.py @@ -167,7 +167,7 @@ class Misc: self.tk.call('focus', 'none') def focus_get(self): name = self.tk.call('focus') - if name == 'none': return None + if name == 'none' or not Name: return None return self._nametowidget(name) def tk_focusNext(self): name = self.tk.call('tk_focusNext', self._w) @@ -963,7 +963,8 @@ class Canvas(Widget): return self.tk.getdouble(self.tk.call( self._w, 'canvasy', screeny, gridspacing)) def coords(self, *args): - return self._do('coords', args) + return map(self.tk.getdouble, + self.tk.splitlist(self._do('coords', args)) def _create(self, itemType, args, kw): # Args: (val, val, ..., cnf={}) args = _flatten(args) cnf = args[-1]