still making both branches closer

[nepi.git] / src / nepi / resources / omf / messages_6.py

diff --git a/src/nepi/resources/omf/messages_6.py b/src/nepi/resources/omf/messages_6.py
index 5b8203c..b7f3044 100644 (file)
--- a/src/nepi/resources/omf/messages_6.py
+++ b/src/nepi/resources/omf/messages_6.py
@@ -114,17 +114,17 @@ class MessageHandler():
             else:
                 properties = self._attr_element(payload,"props","")
 
-            for prop in props.keys():
+            for prop in props:
                 if isinstance(props[prop],str):
                     self._attr_element(properties,prop,props[prop],type_key="type", type_value = "string")
                 elif isinstance(props[prop],dict):
                     key = self._attr_element(properties,prop,"",type_key="type", type_value = "hash")
-                    for comp in props[prop].keys():
+                    for comp in props[prop]:
                         self._attr_element(key,comp,props[prop][comp],type_key="type", type_value = "string")
 
         if guards :
             guardians = self._attr_element(payload,"guard","")
-            for guard in guards.keys():
+            for guard in guards:
                 self._attr_element(guardians,guard,guards[guard],type_key="type", type_value = "string")
 
         return payload
@@ -149,12 +149,12 @@ class MessageHandler():
 
         if props :
             properties = self._attr_element(payload,"props","")
-            for prop in props.keys():
+            for prop in props:
                 self._attr_element(properties,prop,props[prop],type_key="type", type_value = "symbol")
            
         if guards :
             guardians = self._attr_element(payload,"guard","")
-            for guard in guards.keys():
+            for guard in guards:
                 self._attr_element(guardians,guard,guards[guard],type_key="type", type_value = "string")
 
         return payload
@@ -179,12 +179,12 @@ class MessageHandler():
 
         if props :
             properties = self._attr_element(payload,"props","")
-            for prop in props.keys():
+            for prop in list(props.keys()):
                 self._attr_element(properties,prop,props[prop])
 
         if guards :
             guardians = self._attr_element(payload,"guard","")
-            for guard in guards.keys():
+            for guard in list(guards.keys()):
                 self._attr_element(guardians,guard,guards[guard])
         return payload
 
@@ -240,12 +240,12 @@ class MessageHandler():
         if props :
             properties = self._id_element(payload,"props","xmlns:frcp",
                       "http://schema.mytestbed.net/omf/6.0/protocol")
-            for prop in props.keys():
+            for prop in list(props.keys()):
                 self._attr_element(properties,prop,props[prop])
 
         if guards :
             guardians = self._attr_element(payload,"guard","")
-            for guard in guards.keys():
+            for guard in list(guards.keys()):
                 self._attr_element(guardians,guard,guards[guard])
 
         return payload