a first very rough step towards python3

[nepi.git] / src / nepi / resources / ns3 / ns3route.py

diff --git a/src/nepi/resources/ns3/ns3route.py b/src/nepi/resources/ns3/ns3route.py
index bb61368..48a0358 100644 (file)
--- a/src/nepi/resources/ns3/ns3route.py
+++ b/src/nepi/resources/ns3/ns3route.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
@@ -22,8 +21,6 @@ from nepi.execution.resource import clsinit_copy
 from nepi.execution.trace import Trace
 from nepi.resources.ns3.ns3base import NS3Base
 
-import ipaddr
-
 @clsinit_copy
 class NS3Route(NS3Base):
     _rtype = "ns3::Route"
@@ -54,7 +51,7 @@ class NS3Route(NS3Base):
         if not nodes: 
             msg = "Device not connected to node"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         return nodes[0]
 
@@ -84,7 +81,7 @@ class NS3Route(NS3Base):
             msg = "Could not configure route %s/%s hop: %s" % (network, prefix, 
                     nexthop)
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     def _connect_object(self):
         node = self.node