summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-01-21 23:22:03 (GMT)
committerGuido van Rossum <guido@python.org>1997-01-21 23:22:03 (GMT)
commit76f587b7f8d10372f0efc4be94239f3d73c92421 (patch)
treeefd5e2369753342cca201c92dcf891de06099bc6
parentb7cf5bb1c2c16a39605a7aede18a2aff09054662 (diff)
downloadcpython-76f587b7f8d10372f0efc4be94239f3d73c92421.zip
cpython-76f587b7f8d10372f0efc4be94239f3d73c92421.tar.gz
cpython-76f587b7f8d10372f0efc4be94239f3d73c92421.tar.bz2
Avoid traceback in selection_own_get() when no Tk widget owns the
selection; return None instead.
-rw-r--r--Lib/lib-tk/Tkinter.py7
-rwxr-xr-xLib/tkinter/Tkinter.py7
2 files changed, 8 insertions, 6 deletions
diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 9fb1d02..a19cf50 100644
--- 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 9fb1d02..a19cf50 100755
--- 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):