opcodes: Replace manual loop with map

Also remove a superfluous empty line in test file.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

diff --git a/lib/opcodes.py b/lib/opcodes.py
index d0dc45f..959d56b 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1340,8 +1340,8 @@ class OpInstanceMultiAlloc(OpCode):
                        type(state))
 
     if "instances" in state:
-      insts = [OpCode.LoadOpCode(inst) for inst in state["instances"]]
-      state["instances"] = insts
+      state["instances"] = map(OpCode.LoadOpCode, state["instances"])
+
     return OpCode.__setstate__(self, state)
 
   def Validate(self, set_defaults):

diff --git a/test/ganeti.opcodes_unittest.py b/test/ganeti.opcodes_unittest.py
index a5e36d2..c310ecc 100755 (executable)
--- a/test/ganeti.opcodes_unittest.py
+++ b/test/ganeti.opcodes_unittest.py
@@ -297,7 +297,6 @@ class TestOpcodes(unittest.TestCase):
     self.assertEqual(op.value2, "world")
     self.assertEqual(op.debug_level, 123)
 
-
   def testOpInstanceMultiAlloc(self):
     inst = dict([(name, []) for name in opcodes.OpInstanceCreate.GetAllSlots()])
     inst_op = opcodes.OpInstanceCreate(**inst)