Merge branch 'tests'

[nepi.git] / src / nepi / resources / linux / ccn / ccnr.py

diff --git a/src/nepi/resources/linux/ccn/ccnr.py b/src/nepi/resources/linux/ccn/ccnr.py
index 7b785d9..316818d 100644 (file)
--- a/src/nepi/resources/linux/ccn/ccnr.py
+++ b/src/nepi/resources/linux/ccn/ccnr.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -258,7 +257,7 @@ class LinuxCCNR(LinuxApplication):
         else:
             msg = " Failed to execute command '%s'" % command
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     @property
     def _start_command(self):
@@ -296,8 +295,8 @@ class LinuxCCNR(LinuxApplication):
             })
 
         env = self.ccnd.path
-        env += " ".join(map(lambda k: "%s=%s" % (envs.get(k), self.get(k)) \
-            if self.get(k) else "", envs.keys()))
+        env += " ".join(["%s=%s" % (envs.get(k), self.get(k)) \
+            if self.get(k) else "" for k in list(envs.keys())])
        
         return env