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

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

diff --git a/src/nepi/resources/ns3/ns3channel.py b/src/nepi/resources/ns3/ns3channel.py
index 92dc892..b218e51 100644 (file)
--- a/src/nepi/resources/ns3/ns3channel.py
+++ b/src/nepi/resources/ns3/ns3channel.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,8 +24,8 @@ class NS3BaseChannel(NS3Base):
     _rtype = "abstract::ns3::Channel"
 
     @property
-    def simulator(self):
-        return self.devices[0].node.simulator
+    def simulation(self):
+        return self.devices[0].node.simulation
 
     @property
     def devices(self):
@@ -36,13 +35,16 @@ class NS3BaseChannel(NS3Base):
         if not devices: 
             msg = "Channel not connected to devices"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         return devices
 
     @property
     def _rms_to_wait(self):
         rms = set()
-        rms.add(self.simulator)
+        rms.add(self.simulation)
         return rms
 
+    def _connect_object(self):
+        pass
+