Avoid traceback in selection_own_get() when no Tk widget owns the

selection; return None instead.

Avoid traceback in selection_own_get() when no Tk widget owns the
selection; return None instead.
e6c75f8a · Guido van Rossum · 57989664 · e6c75f8a · e6c75f8a
Commit e6c75f8a authored Jan 21, 1997 by Guido van Rossum
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

Lib/lib-tk/Tkinter.py Lib/lib-tk/Tkinter.py +4 -3

Lib/tkinter/Tkinter.py Lib/tkinter/Tkinter.py +4 -3

No files found.
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -267,9 +267,10 @@ class Misc:
 	def selection_own_get(self, **kw):
 		"Find owner of X selection."
 		if not kw.has_key('displayof'): kw['displayof'] = self._w
-		return self._nametowidget(
+		name = apply(self.tk.call,
-			apply(self.tk.call,
+			     ('selection', 'own') + self._options(kw))
-			      ('selection', 'own') + self._options(kw)))
+		if not name: return None
+		return self._nametowidget(name)
 	def send(self, interp, cmd, *args):
 		return apply(self.tk.call, ('send', interp, cmd) + args)
 	def lower(self, belowThis=None):

--- a/Lib/tkinter/Tkinter.py
+++ b/Lib/tkinter/Tkinter.py
@@ -267,9 +267,10 @@ class Misc:
 	def selection_own_get(self, **kw):
 		"Find owner of X selection."
 		if not kw.has_key('displayof'): kw['displayof'] = self._w
-		return self._nametowidget(
+		name = apply(self.tk.call,
-			apply(self.tk.call,
+			     ('selection', 'own') + self._options(kw))
-			      ('selection', 'own') + self._options(kw)))
+		if not name: return None
+		return self._nametowidget(name)
 	def send(self, interp, cmd, *args):
 		return apply(self.tk.call, ('send', interp, cmd) + args)
 	def lower(self, belowThis=None):