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

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

diff --git a/src/nepi/resources/planetlab/ns3/fdudptunnel.py b/src/nepi/resources/planetlab/ns3/fdudptunnel.py
index 0ce26f8..3b9abae 100644 (file)
--- a/src/nepi/resources/planetlab/ns3/fdudptunnel.py
+++ b/src/nepi/resources/planetlab/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
@@ -44,7 +43,7 @@ class PlanetlabNs3FdUdpTunnel(LinuxNs3FdUdpTunnel):
             if not devices or len(devices) != 2: 
                 msg = "Tunnel must be connected to exactly two FdNetDevices"
                 self.error(msg)
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
 
             self._fd1 = devices[0]
             self._fd2 = devices[1]
@@ -68,7 +67,7 @@ class PlanetlabNs3FdUdpTunnel(LinuxNs3FdUdpTunnel):
                     self._fd2node.get("hostname"):
                 msg = "Tunnel requires endpoints on different hosts"
                 self.error(msg)
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
 
         return [self._fd1, self._fd2]