still making both branches closer

[nepi.git] / src / nepi / resources / ns3 / ns3wrapper_debug.py

diff --git a/src/nepi/resources/ns3/ns3wrapper_debug.py b/src/nepi/resources/ns3/ns3wrapper_debug.py
index 332f63b..70a84b7 100644 (file)
--- a/src/nepi/resources/ns3/ns3wrapper_debug.py
+++ b/src/nepi/resources/ns3/ns3wrapper_debug.py
@@ -166,13 +166,10 @@ wrapper = NS3Wrapper()
         return pprint.pformat(value)
 
     def format_args(self, args):
-        fargs = map(self.format_value, args)
-        return "[%s]" % ",".join(fargs)
+        return "[%s]" % ",".join(self.format_value(arg) for arg in args)
 
     def format_kwargs(self, kwargs):
-        fkwargs = map(lambda (k,w): 
-               "%s: %s" % (self.format_value(k), self.format_value(w)), 
-            kwargs.iteritems())
+        fkwargs = ["%s: %s" % (self.format_value(k), self.format_value(v)) for (k, v) in kwargs.items()]
         
         return  "dict({%s})" % ",".join(fkwargs)