[Python-checkins] cpython (merge 3.4 -> default): Added missed calls of splitlist().

Sun Jun 1 10:23:19 CEST 2014

http://hg.python.org/cpython/rev/bb43815ba4f6
changeset: 90942:bb43815ba4f6
parent: 90939:f98b0a5e5ef5
parent: 90941:dfe92d077570
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Jun 01 11:22:21 2014 +0300
summary:
 Added missed calls of splitlist().
files:
 Lib/tkinter/font.py | 3 +-
 Lib/tkinter/test/test_ttk/test_functions.py | 2 -
 Lib/tkinter/ttk.py | 11 ++++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Lib/tkinter/font.py b/Lib/tkinter/font.py
--- a/Lib/tkinter/font.py
+++ b/Lib/tkinter/font.py
@@ -81,7 +81,8 @@
 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
diff --git a/Lib/tkinter/test/test_ttk/test_functions.py b/Lib/tkinter/test/test_ttk/test_functions.py
--- a/Lib/tkinter/test/test_ttk/test_functions.py
+++ b/Lib/tkinter/test/test_ttk/test_functions.py
@@ -407,8 +407,6 @@
 ('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/tkinter/ttk.py b/Lib/tkinter/ttk.py
--- a/Lib/tkinter/ttk.py
+++ b/Lib/tkinter/ttk.py
@@ -275,6 +275,7 @@
 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
@@ -293,8 +294,6 @@
 indx += 2
 
 if opt == 'children':
- if not tk.wantobjects():
- val = tk.splitlist(val)
 val = _list_from_layouttuple(tk, val)
 
 opts[opt] = val
@@ -408,8 +407,8 @@
 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):
@@ -463,8 +462,8 @@
 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):
-- 
Repository URL: http://hg.python.org/cpython
