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

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

diff --git a/src/nepi/resources/ns3/ns3propagationlossmodel.py b/src/nepi/resources/ns3/ns3propagationlossmodel.py
index fdaef38..9c6c3c7 100644 (file)
--- a/src/nepi/resources/ns3/ns3propagationlossmodel.py
+++ b/src/nepi/resources/ns3/ns3propagationlossmodel.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
@@ -25,18 +24,18 @@ class NS3BasePropagationLossModel(NS3Base):
     _rtype = "ns3::PropagationLossModel"
 
     @property
-    def simulator(self):
-        return self.channel.simulator
+    def simulation(self):
+        return self.channel.simulation
 
     @property
     def channel(self):
-        from nepi.resources.ns3.ns3channel import NS3BaseChannel
-        channels = self.get_connected(NS3BaseChannel.get_rtype())
+        from nepi.resources.ns3.ns3wifichannel import NS3BaseWifiChannel
+        channels = self.get_connected(NS3BaseWifiChannel.get_rtype())
 
         if not channels: 
             msg = "PropagationLossModel not connected to channel"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         return channels[0]
 
@@ -49,6 +48,6 @@ class NS3BasePropagationLossModel(NS3Base):
     def _connect_object(self):
         channel = self.channel
         if channel.uuid not in self.connected:
-            self.simulator.invoke(channel.uuid, "SetPropagationLossModel", self.uuid)
+            self.simulation.invoke(channel.uuid, "SetPropagationLossModel", self.uuid)
             self._connected.add(channel.uuid)