the big merge

[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 331c944..b335974 100644 (file)
--- a/src/nepi/resources/ns3/ns3wifiphy.py
+++ b/src/nepi/resources/ns3/ns3wifiphy.py
@@ -16,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
@@ -27,9 +29,12 @@ class NS3BaseWifiPhy(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)