Merge pull request #1970 from benfitzpatrick/rose-edit.fix-var-info

rose edit: fix info dialog for variables
metomi · Aug 30, 2016 · a647264 · a647264
2 parents 932556a + 88e5906
commit a647264
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/python/rose/config_editor/util.py b/lib/python/rose/config_editor/util.py
@@ -117,7 +117,11 @@ def launch_node_info_dialog(node, changes, search_function):
         text += (rose.config_editor.DIALOG_NODE_INFO_CHANGES.format(changes) +
                  "\n")
     text += rose.config_editor.DIALOG_NODE_INFO_DATA
-    att_list = vars(node).items()
+    try:
+        att_list = vars(node).items()
+    except TypeError:
+        # vars will fail when __slots__ are used.
+        att_list = node.getattrs()
     att_list.sort()
     att_list.sort(lambda x, y: (y[0] in ['name', 'value']) -
                                (x[0] in ['name', 'value']))

diff --git a/lib/python/rose/variable.py b/lib/python/rose/variable.py
@@ -127,6 +127,13 @@ def copy(self):
         new_variable.old_value = self.old_value
         return new_variable
 
+    def getattrs(self):
+        """Return a list of attributes and values."""
+        attrs = []
+        for name in self.__slots__:
+            attrs.append((name, getattr(self, name)))
+        return attrs
+
     def __repr__(self):
         text = '<rose.variable :- name: ' + self.name + ', value: '
         text += (