]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Redo these changes:
authorGuido van Rossum <guido@python.org>
Mon, 27 Jun 1994 07:55:59 +0000 (07:55 +0000)
committerGuido van Rossum <guido@python.org>
Mon, 27 Jun 1994 07:55:59 +0000 (07:55 +0000)
(Menu.index): return int or None, not string
(Widget.__getitem__): use splitlist, not split

Lib/lib-tk/Tkinter.py
Lib/tkinter/Tkinter.py

index 4d2dd3ab1a1ebb0731309d73013fc29da1735b2f..2c3390b090357292ad3c555945a01a85c128b8f2 100644 (file)
@@ -583,7 +583,7 @@ class Widget(Misc, Pack, Place):
                apply(self.tk.call, (self._w, 'configure')
                      + self._options(cnf))
        def __getitem__(self, key):
-               v = self.tk.split(self.tk.call(
+               v = self.tk.splitlist(self.tk.call(
                        self._w, 'configure', '-' + key))
                return v[4]
        def __setitem__(self, key, value):
@@ -940,7 +940,9 @@ class Menu(Widget):
                apply(self.tk.call, (self._w, 'entryconfigure', index)
                      + self._options(cnf))
        def index(self, index):
-               return self.tk.call(self._w, 'index', index)
+               i = self.tk.call(self._w, 'index', index)
+               if i == 'none': return None
+               return self.tk.getint(i)
        def invoke(self, index):
                return self.tk.call(self._w, 'invoke', index)
        def post(self, x, y):
index 4d2dd3ab1a1ebb0731309d73013fc29da1735b2f..2c3390b090357292ad3c555945a01a85c128b8f2 100755 (executable)
@@ -583,7 +583,7 @@ class Widget(Misc, Pack, Place):
                apply(self.tk.call, (self._w, 'configure')
                      + self._options(cnf))
        def __getitem__(self, key):
-               v = self.tk.split(self.tk.call(
+               v = self.tk.splitlist(self.tk.call(
                        self._w, 'configure', '-' + key))
                return v[4]
        def __setitem__(self, key, value):
@@ -940,7 +940,9 @@ class Menu(Widget):
                apply(self.tk.call, (self._w, 'entryconfigure', index)
                      + self._options(cnf))
        def index(self, index):
-               return self.tk.call(self._w, 'index', index)
+               i = self.tk.call(self._w, 'index', index)
+               if i == 'none': return None
+               return self.tk.getint(i)
        def invoke(self, index):
                return self.tk.call(self._w, 'invoke', index)
        def post(self, x, y):