Merge pull request #917 from mdboom/qcombobox

mdboom · mdboom · commit c1fdefd52122 · 2012-06-18T14:05:51.000-07:00
formlayout: TypeError: QComboBox.addItems(QStringList): argument 1 has unexpected type 'list'
diff --git a/lib/matplotlib/backends/qt4_editor/formlayout.py b/lib/matplotlib/backends/qt4_editor/formlayout.py
@@ -271,7 +271,9 @@ def setup(self):
             elif isinstance(value, (str, unicode)):
                 field = QLineEdit(value, self)
             elif isinstance(value, (list, tuple)):
-                selindex = list(value).pop(0)
+                if isinstance(value, tuple):
+                    value = list(value)
+                selindex = value.pop(0)
                 field = QComboBox(self)
                 if isinstance(value[0], (list, tuple)):
                     keys = [ key for key, _val in value ]
