Add python3 support. (#270)

2026-07-26 05:53:45 +00:00 · 2016-07-21 06:31:34 -07:00
parent 6d48a7b34d
commit 9754e72496
74 changed files with 77 additions and 77 deletions
@@ -52,7 +52,7 @@ class Cert_5_1_01_RouterAttach(unittest.TestCase):
        self.nodes[ROUTER].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -69,7 +69,7 @@ class Cert_5_1_02_ChildAddressTimeout(unittest.TestCase):
        self.nodes[SED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -62,7 +62,7 @@ class Cert_5_1_03_RouterAddressReallocation(unittest.TestCase):
        self.nodes[ROUTER2].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -62,7 +62,7 @@ class Cert_5_1_04_RouterAddressReallocation(unittest.TestCase):
        self.nodes[ROUTER2].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -53,7 +53,7 @@ class Cert_5_1_05_RouterAddressTimeout(unittest.TestCase):
        self.nodes[ROUTER1].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -53,7 +53,7 @@ class Cert_5_1_06_RemoveRouterId(unittest.TestCase):
        self.nodes[ROUTER1].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -67,7 +67,7 @@ class Cert_5_1_07_MaxChildCount(unittest.TestCase):
            self.nodes[i].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -78,7 +78,7 @@ class Cert_5_1_08_RouterAttachConnectivity(unittest.TestCase):
        self.nodes[ROUTER4].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -80,7 +80,7 @@ class Cert_5_1_09_REEDAttachConnectivity(unittest.TestCase):
        self.nodes[ROUTER2].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -69,7 +69,7 @@ class Cert_5_1_10_RouterAttachLinkQuality(unittest.TestCase):
        self.nodes[ROUTER3].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -70,7 +70,7 @@ class Cert_5_1_11_REEDAttachLinkQuality(unittest.TestCase):
        self.nodes[ROUTER1].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -60,7 +60,7 @@ class Cert_5_1_12_NewRouterSync(unittest.TestCase):
        self.nodes[ROUTER2].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -52,7 +52,7 @@ class Cert_5_1_13_RouterReset(unittest.TestCase):
        self.nodes[ROUTER].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -60,7 +60,7 @@ class Cert_5_2_1_BecomeActiveRouter(unittest.TestCase):
        self.nodes[REED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -55,7 +55,7 @@ class Cert_5_2_2_LeaderReject1Hop(unittest.TestCase):
            self.nodes[i].set_router_upgrade_threshold(33)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -64,7 +64,7 @@ class Cert_5_2_3_LeaderReject2Hops(unittest.TestCase):
        self.nodes[DUT].set_router_upgrade_threshold(33)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -69,7 +69,7 @@ class Cert_5_2_4_REEDUpgrade(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -91,7 +91,7 @@ class Cert_5_2_5_AddressQuery(unittest.TestCase):
        self.nodes[ED3].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -83,7 +83,7 @@ class Cert_5_2_7_REEDSynchronization(unittest.TestCase):
        self.nodes[ROUTER3].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -53,7 +53,7 @@ class Cert_5_3_1_LinkLocal(unittest.TestCase):
        self.nodes[ROUTER1].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_5_3_2_RealmLocal(unittest.TestCase):
        self.nodes[SED1].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -77,7 +77,7 @@ class Cert_5_3_3_AddressQuery(unittest.TestCase):
        self.nodes[ED2].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -88,7 +88,7 @@ class Cert_5_3_4_AddressMapCache(unittest.TestCase):
        self.nodes[ED5].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -69,7 +69,7 @@ class Cert_5_3_5_RoutingLinkQuality(unittest.TestCase):
        self.nodes[ROUTER3].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -60,7 +60,7 @@ class Cert_5_3_6_RouterIdMask(unittest.TestCase):
        self.nodes[ROUTER2].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -60,7 +60,7 @@ class Cert_5_3_6_RouterIdMask(unittest.TestCase):
        self.nodes[ROUTER2].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -81,7 +81,7 @@ class Cert_5_3_7_DuplicateAddress(unittest.TestCase):
        self.nodes[ED3].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -74,7 +74,7 @@ class Cert_5_3_8_ChildAddressSet(unittest.TestCase):
        self.nodes[ED4].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -76,7 +76,7 @@ class Cert_5_3_9_AddressQuery(unittest.TestCase):
        self.nodes[SED2].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -52,7 +52,7 @@ class Cert_5_5_1_LeaderReset(unittest.TestCase):
        self.nodes[ROUTER].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -60,7 +60,7 @@ class Cert_5_5_2_LeaderReboot(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -81,7 +81,7 @@ class Cert_5_5_3_SplitMergeChildren(unittest.TestCase):
        self.nodes[ED3].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -82,7 +82,7 @@ class Cert_5_5_4_SplitMergeRouters(unittest.TestCase):
        self.nodes[ED1].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -77,7 +77,7 @@ class Cert_5_5_5_SplitMergeREED(unittest.TestCase):
        self.nodes[REED2].set_router_upgrade_threshold(0)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -63,7 +63,7 @@ class Cert_5_5_6_SplitWeight(unittest.TestCase):
        self.nodes[ROUTER2].set_weight(0)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -67,7 +67,7 @@ class Cert_5_5_7_SplitMergeThreeWay(unittest.TestCase):
        self.nodes[ROUTER3].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -76,7 +76,7 @@ class Cert_5_5_8_SplitRoutersLostLeader(unittest.TestCase):
        self.nodes[ED1].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_5_6_1_NetworkDataLeaderAsBr(unittest.TestCase):
        self.nodes[SED1].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_5_6_2_NetworkDataRouterAsBr(unittest.TestCase):
        self.nodes[SED1].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_5_6_3_NetworkDataRegisterAfterAttachLeader(unittest.TestCase):
        self.nodes[SED1].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_5_6_4_NetworkDataRegisterAfterAttachRouter(unittest.TestCase):
        self.nodes[SED1].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(unittest.TestCase):
        self.nodes[SED1].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_5_6_6_NetworkDataExpiration(unittest.TestCase):
        self.nodes[SED1].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -61,7 +61,7 @@ class Cert_5_6_7_NetworkDataRequestREED(unittest.TestCase):
        self.nodes[REED].set_router_upgrade_threshold(0)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -61,7 +61,7 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -75,7 +75,7 @@ class Cert_5_6_9_NetworkDataForwarding(unittest.TestCase):
        self.nodes[SED].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -53,7 +53,7 @@ class Cert_5_8_1_KeySynchronization(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -52,7 +52,7 @@ class Cert_5_8_2_KeyIncrement(unittest.TestCase):
        self.nodes[ROUTER].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -53,7 +53,7 @@ class Cert_5_8_3_KeyIncrementRollOver(unittest.TestCase):
        self.nodes[ROUTER].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -52,7 +52,7 @@ class Cert_6_1_1_RouterAttach(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -60,7 +60,7 @@ class Cert_6_1_2_REEDAttach(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -78,7 +78,7 @@ class Cert_6_1_3_RouterAttachConnectivity(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -80,7 +80,7 @@ class Cert_6_1_4_REEDAttachConnectivity(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -69,7 +69,7 @@ class Cert_6_1_5_RouterAttachLinkQuality(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -70,7 +70,7 @@ class Cert_6_1_6_REEDAttachLinkQuality(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -82,7 +82,7 @@ class Cert_6_1_7_EDSynchronization(unittest.TestCase):
        self.nodes[ROUTER3].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -59,7 +59,7 @@ class Cert_6_2_1_NewPartition(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -69,7 +69,7 @@ class Cert_6_2_2_NewPartition(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -60,7 +60,7 @@ class Cert_6_3_1_OrphanReattach(unittest.TestCase):
        self.nodes[ED].set_timeout(10)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -54,7 +54,7 @@ class Cert_5_6_2_NetworkDataUpdate(unittest.TestCase):
        self.nodes[ED].set_timeout(10)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -53,7 +53,7 @@ class Cert_6_4_1_LinkLocal(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -60,7 +60,7 @@ class Cert_5_3_2_RealmLocal(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -53,7 +53,7 @@ class Cert_6_5_1_ChildResetSynchronize(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -52,7 +52,7 @@ class Cert_6_5_2_ChildResetReattach(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -52,7 +52,7 @@ class Cert_6_6_1_KeyIncrement(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -53,7 +53,7 @@ class Cert_6_6_2_KeyIncrement1(unittest.TestCase):
        self.nodes[ED].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_7_1_1_BorderRouterAsLeader(unittest.TestCase):
        self.nodes[ED1].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_7_1_2_BorderRouterAsRouter(unittest.TestCase):
        self.nodes[SED2].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_7_1_3_BorderRouterAsLeader(unittest.TestCase):
        self.nodes[ED1].enable_whitelist()

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_7_1_4_BorderRouterAsRouter(unittest.TestCase):
        self.nodes[SED2].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -68,7 +68,7 @@ class Cert_7_1_5_BorderRouterAsRouter(unittest.TestCase):
        self.nodes[SED2].set_timeout(3)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -40,7 +40,7 @@ class Cert_Cli(unittest.TestCase):
        self.nodes[LEADER] = node.Node(LEADER)

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -56,7 +56,7 @@ class Test_MacScan(unittest.TestCase):
        self.nodes[ROUTER].set_network_name('OpenThread')

    def tearDown(self):
-        for node in self.nodes.itervalues():
+        for node in list(self.nodes.values()):
            node.stop()
        del self.nodes

@@ -58,7 +58,7 @@ class Node:
        else:
            cmd = './ot-cli'
        cmd += ' %d' % nodeid
-        print cmd
+        print ("%s" % cmd)

        self.pexpect = pexpect.spawn(cmd, timeout=2)

@@ -73,7 +73,7 @@ class Node:
        self.pexpect.close(force=True)

    def send_command(self, cmd):
-        print self.nodeid, ":", cmd
+        print ("%d: %s" % (self.nodeid, cmd))
        self.pexpect.sendline(cmd)

    def get_commands(self):
@@ -137,7 +137,7 @@ class Node:
        self.send_command('extaddr')
        i = self.pexpect.expect('([0-9a-fA-F]{16})')
        if i == 0:
-            addr64 = self.pexpect.match.groups()[0]
+            addr64 = self.pexpect.match.groups()[0].decode("utf-8")
        self.pexpect.expect('Done')
        return addr64

@@ -241,7 +241,7 @@ class Node:
        while True:
            i = self.pexpect.expect(['(\S+:\S+)\r\n', 'Done'])
            if i == 0:
-                addrs.append(self.pexpect.match.groups()[0])
+                addrs.append(self.pexpect.match.groups()[0].decode("utf-8"))
            elif i == 1:
                break