applied the except and raise fixers to the master branch to close the gap with py3

[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 7183325..5e766f1 100644 (file)
--- a/src/nepi/resources/linux/ns3/fdudptunnel.py
+++ b/src/nepi/resources/linux/ns3/fdudptunnel.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
@@ -94,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]
@@ -113,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]
 
@@ -276,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
 
@@ -305,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)
@@ -318,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)