a first very rough step towards python3

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

diff --git a/src/nepi/resources/ns3/ns3wifiphy.py b/src/nepi/resources/ns3/ns3wifiphy.py
index 4ea0248..c1dfbee 100644 (file)
--- a/src/nepi/resources/ns3/ns3wifiphy.py
+++ b/src/nepi/resources/ns3/ns3wifiphy.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
@@ -30,7 +29,7 @@ class NS3BaseWifiPhy(NS3Base):
     def _register_attributes(cls):
         standard = Attribute("Standard", "Wireless standard",
                 default = "WIFI_PHY_STANDARD_80211a",
-                allowed = WIFI_STANDARDS.keys(),
+                allowed = list(WIFI_STANDARDS.keys()),
                 type = Types.Enumerate,
                 flags = Flags.Design)
 
@@ -48,7 +47,7 @@ class NS3BaseWifiPhy(NS3Base):
         if not devices: 
             msg = "WifiPhy not connected to device"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         return devices[0]
 
@@ -60,7 +59,7 @@ class NS3BaseWifiPhy(NS3Base):
         if not channels: 
             msg = "WifiPhy not connected to channel"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         return channels[0]