a first very rough step towards python3

[nepi.git] / src / nepi / resources / linux / ns3 / fdudptunnel.py

diff --git a/src/nepi/resources/linux/ns3/fdudptunnel.py b/src/nepi/resources/linux/ns3/fdudptunnel.py
index 16816ef..9cc20d0 100644 (file)
--- a/src/nepi/resources/linux/ns3/fdudptunnel.py
+++ b/src/nepi/resources/linux/ns3/fdudptunnel.py
@@ -93,7 +93,7 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel):
             if not devices or len(devices) != 2: 
                 msg = "linux::ns3::TunTapFdLink must be connected to exactly one FdNetDevice"
                 self.error(msg)
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
 
             self._fd1 = devices[0]
             self._fd2 = devices[1]
@@ -112,7 +112,7 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel):
                     self._fd2node.get("hostname"):
                 msg = "linux::ns3::FdUdpTunnel requires endpoints on different hosts"
                 self.error(msg)
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
 
         return [self._fd1, self._fd2]
 
@@ -263,7 +263,7 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel):
         node = self.endpoint_node(endpoint) 
         run_home = self.run_home(endpoint)
 
-        for i in xrange(20):
+        for i in range(20):
             (out, err), proc = node.check_output(run_home, filename)
 
             if out:
@@ -275,7 +275,7 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel):
         else:
             msg = "Couldn't retrieve %s" % filename
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         return result
 
@@ -304,7 +304,7 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel):
         
         if proc.poll():
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
     
         # Wait for pid file to be generated
         pid, ppid = node.wait_pid(run_home)
@@ -317,7 +317,7 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel):
         if err:
             msg = " Failed to start command '%s' " % command
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         port = self.wait_local_port(endpoint)