a first very rough step towards python3

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

diff --git a/src/nepi/resources/ns3/ns3netdevice.py b/src/nepi/resources/ns3/ns3netdevice.py
index 3d74a72..f998085 100644 (file)
--- a/src/nepi/resources/ns3/ns3netdevice.py
+++ b/src/nepi/resources/ns3/ns3netdevice.py
@@ -21,7 +21,7 @@ from nepi.execution.resource import clsinit_copy
 from nepi.execution.trace import Trace
 from nepi.resources.ns3.ns3base import NS3Base
 
-import ipaddr
+import ipaddress
 
 @clsinit_copy
 class NS3BaseNetDevice(NS3Base):
@@ -65,7 +65,7 @@ class NS3BaseNetDevice(NS3Base):
         if not nodes: 
             msg = "Device not connected to node"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         return nodes[0]
 
@@ -77,7 +77,7 @@ class NS3BaseNetDevice(NS3Base):
         if not channels: 
             msg = "Device not connected to channel"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         return channels[0]
 
@@ -89,7 +89,7 @@ class NS3BaseNetDevice(NS3Base):
         if not queue: 
             msg = "Device not connected to queue"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         return queue[0]
 
@@ -150,7 +150,7 @@ class NS3BaseNetDevice(NS3Base):
         ip = self.get("ip")
         prefix = self.get("prefix")
 
-        i = ipaddr.IPAddress(ip)
+        i = ipaddress.ip_address(ip)
         if i.version == 4:
             # IPv4
             ipv4 = self.node.ipv4