the big merge

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

diff --git a/src/nepi/resources/ns3/ns3wifimac.py b/src/nepi/resources/ns3/ns3wifimac.py
index e8ab8b6..801a2ee 100644 (file)
--- a/src/nepi/resources/ns3/ns3wifimac.py
+++ b/src/nepi/resources/ns3/ns3wifimac.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
@@ -17,6 +16,8 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+from six import PY3
+
 from nepi.execution.attribute import Attribute, Flags, Types
 from nepi.execution.resource import clsinit_copy
 from nepi.resources.ns3.ns3base import NS3Base
@@ -28,9 +29,12 @@ class NS3BaseWifiMac(NS3Base):
 
     @classmethod
     def _register_attributes(cls):
+        # stay safe and keep extra list() added by 2to3
+        allowed = WIFI_STANDARDS.keys()
+        if PY3: allowed = list(allowed)
         standard = Attribute("Standard", "Wireless standard",
                 default = "WIFI_PHY_STANDARD_80211a",
-                allowed = WIFI_STANDARDS.keys(),
+                allowed = allowed,
                 type = Types.Enumerate,
                 flags = Flags.Design)
 
@@ -48,7 +52,7 @@ class NS3BaseWifiMac(NS3Base):
         if not devices: 
             msg = "WifiMac not connected to device"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         return devices[0]