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

selection; return None instead.

diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 9fb1d025ebedaf1b8012f4ad0d05949c328621e6..a19cf5054b40a0ca65922890543932f2d62409d6 100644 (file)
--- 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(
-                       apply(self.tk.call,
-                             ('selection', 'own') + self._options(kw)))
+               name = apply(self.tk.call,
+                            ('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):

diff --git a/Lib/tkinter/Tkinter.py b/Lib/tkinter/Tkinter.py
index 9fb1d025ebedaf1b8012f4ad0d05949c328621e6..a19cf5054b40a0ca65922890543932f2d62409d6 100755 (executable)
--- 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(
-                       apply(self.tk.call,
-                             ('selection', 'own') + self._options(kw)))
+               name = apply(self.tk.call,
+                            ('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):