From: smbaker <smbaker@fc8clean.lan>
Date: Thu, 1 Dec 2011 21:19:33 +0000 (-0800)
Subject: fix support for new get_default_sliver_attributes returning dicts
X-Git-Tag: sface-0.1-21~4
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=c07803c550c122fac6a6537889faf1552f420580;hp=782daa0f7f40ac4976b4e4a6ce0db7b98db725ad

fix support for new get_default_sliver_attributes returning dicts
---

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index d66e114..6beaec2 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -601,7 +601,9 @@ class SliceWidget(QWidget):
             # Add default slice tags
             nodeItem = self.nodeView.appendRow(networkItem, "%s for %s" % (default_tags, network), kind="defaults")
             attrs = rspec.get_default_sliver_attributes(network)
-            for (name, value) in attrs:
+            for attr in attrs:
+                    name = attr.get("name", None)
+                    value = attr.get("value", None)
                     tagstring = QString("%s: %s" % (name, value))
                     self.nodeView.appendRow(nodeItem, tagstring, membership=tag_status['in'], kind = "attribute")
 
@@ -614,7 +616,9 @@ class SliceWidget(QWidget):
                                kind="node")
 
                 attrs = rspec.get_sliver_attributes(node, network)
-                for (name, value) in attrs:
+                for attr in attrs:
+                    name = attr.get("name", None)
+                    value = attr.get("value", None)
                     self.nodeView.appendRow(nodeItem,
                                             "%s: %s" % (name, value),
                                             membership=tag_status['in'],