diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-06-01 08:21:34 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-06-01 08:21:34 (GMT) |
| commit | adad50c8fb78e8fe7079d5e1ca833f65b1947e00 (patch) | |
| tree | bc7bc0ed7ea5d597681da2d6ffdd9f134ffa86cd | |
| parent | f74805b2cba86a8235506bcde3f2b68aaa730d71 (diff) | |
| download | cpython-adad50c8fb78e8fe7079d5e1ca833f65b1947e00.zip cpython-adad50c8fb78e8fe7079d5e1ca833f65b1947e00.tar.gz cpython-adad50c8fb78e8fe7079d5e1ca833f65b1947e00.tar.bz2 | |
Added missed calls of splitlist().
| -rw-r--r-- | Lib/lib-tk/test/test_ttk/test_functions.py | 2 | ||||
| -rw-r--r-- | Lib/lib-tk/tkFont.py | 3 | ||||
| -rw-r--r-- | Lib/lib-tk/ttk.py | 11 |
3 files changed, 7 insertions, 9 deletions
diff --git a/Lib/lib-tk/test/test_ttk/test_functions.py b/Lib/lib-tk/test/test_ttk/test_functions.py index 78737f5..50c5aeb 100644 --- a/Lib/lib-tk/test/test_ttk/test_functions.py +++ b/Lib/lib-tk/test/test_ttk/test_functions.py @@ -407,8 +407,6 @@ class InternalFunctionsTest(unittest.TestCase): ('name', 'no_minus', 'value')) self.assertRaises(ValueError, ttk._list_from_layouttuple, tk, ('something', '-children')) # no children - self.assertRaises(ValueError, ttk._list_from_layouttuple, tk, - ('something', '-children', 'value')) # invalid children def test_val_or_dict(self): diff --git a/Lib/lib-tk/tkFont.py b/Lib/lib-tk/tkFont.py index 229f251..61c2f86 100644 --- a/Lib/lib-tk/tkFont.py +++ b/Lib/lib-tk/tkFont.py @@ -78,7 +78,8 @@ class Font: if exists: self.delete_font = False # confirm font exists - if self.name not in root.tk.call("font", "names"): + if self.name not in root.tk.splitlist( + root.tk.call("font", "names")): raise Tkinter._tkinter.TclError, "named font %s does not already exist" % (self.name,) # if font config info supplied, apply it if font: diff --git a/Lib/lib-tk/ttk.py b/Lib/lib-tk/ttk.py index df81397..77f1d3a 100644 --- a/Lib/lib-tk/ttk.py +++ b/Lib/lib-tk/ttk.py @@ -277,6 +277,7 @@ def _list_from_statespec(stuple): def _list_from_layouttuple(tk, ltuple): """Construct a list from the tuple returned by ttk::layout, this is somewhat the reverse of _format_layoutlist.""" + ltuple = tk.splitlist(ltuple) res = [] indx = 0 @@ -295,8 +296,6 @@ def _list_from_layouttuple(tk, ltuple): indx += 2 if opt == 'children': - if not tk.wantobjects(): - val = tk.splitlist(val) val = _list_from_layouttuple(tk, val) opts[opt] = val @@ -410,8 +409,8 @@ class Style(object): return _list_from_statespec(self.tk.splitlist( self.tk.call(self._name, "map", style, '-%s' % query_opt))) - return _dict_from_tcltuple( - self.tk.call(self._name, "map", style, *(_format_mapdict(kw)))) + return _dict_from_tcltuple(self.tk.splitlist( + self.tk.call(self._name, "map", style, *(_format_mapdict(kw))))) def lookup(self, style, option, state=None, default=None): @@ -465,8 +464,8 @@ class Style(object): lspec = "null" # could be any other word, but this may make sense # when calling layout(style) later - return _list_from_layouttuple(self.tk, self.tk.splitlist( - self.tk.call(self._name, "layout", style, lspec))) + return _list_from_layouttuple(self.tk, + self.tk.call(self._name, "layout", style, lspec)) def element_create(self, elementname, etype, *args, **kw): |