still making both branches closer

[nepi.git] / src / nepi / resources / linux / netns / netnsemulation.py

diff --git a/src/nepi/resources/linux/netns/netnsemulation.py b/src/nepi/resources/linux/netns/netnsemulation.py
index d7be656..e39831c 100644 (file)
--- a/src/nepi/resources/linux/netns/netnsemulation.py
+++ b/src/nepi/resources/linux/netns/netnsemulation.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2014 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
@@ -185,7 +184,7 @@ class LinuxNetNSEmulation(LinuxApplication, NetNSEmulation):
         else:
             msg = " Failed to execute command '%s'" % command
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     def do_stop(self):
         """ Stops simulation execution
@@ -370,7 +369,7 @@ class LinuxNetNSEmulation(LinuxApplication, NetNSEmulation):
         """
         command = " [ -e %s ] && echo 'DONE' " % self.remote_socket
 
-        for i in xrange(200):
+        for i in range(200):
             (out, err), proc = self.node.execute(command, retry = 1, 
                     with_lock = True)