From e37afe996b143d0eb78ad5f6b34be97337e928c3 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Thu, 12 Jul 2018 08:26:03 +0000
Subject: [PATCH] First crack at Python 3 compatibility

Mostly we just use mininet.util.pexpect so that we can use
unicode strings without changing calls to pexpect.spawn()
---
 examples/test/test_bind.py            | 2 +-
 examples/test/test_clusterSanity.py   | 2 +-
 examples/test/test_controllers.py     | 2 +-
 examples/test/test_controlnet.py      | 2 +-
 examples/test/test_cpu.py             | 2 +-
 examples/test/test_emptynet.py        | 2 +-
 examples/test/test_hwintf.py          | 2 +-
 examples/test/test_intfoptions.py     | 2 +-
 examples/test/test_limit.py           | 2 +-
 examples/test/test_linearbandwidth.py | 2 +-
 examples/test/test_linuxrouter.py     | 2 +-
 examples/test/test_multilink.py       | 2 +-
 examples/test/test_multiping.py       | 2 +-
 examples/test/test_multipoll.py       | 2 +-
 examples/test/test_multitest.py       | 2 +-
 examples/test/test_nat.py             | 2 +-
 examples/test/test_natnet.py          | 2 +-
 examples/test/test_numberedports.py   | 2 +-
 examples/test/test_popen.py           | 2 +-
 examples/test/test_scratchnet.py      | 2 +-
 examples/test/test_simpleperf.py      | 2 +-
 examples/test/test_sshd.py            | 2 +-
 examples/test/test_tree1024.py        | 2 +-
 examples/test/test_treeping64.py      | 2 +-
 examples/test/test_vlanhost.py        | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/examples/test/test_bind.py b/examples/test/test_bind.py
index dcc9fbf..e423e39 100755
--- a/examples/test/test_bind.py
+++ b/examples/test/test_bind.py
@@ -5,7 +5,7 @@ Tests for bind.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 
 class testBind( unittest.TestCase ):
 
diff --git a/examples/test/test_clusterSanity.py b/examples/test/test_clusterSanity.py
index cdbc390..13e51e2 100755
--- a/examples/test/test_clusterSanity.py
+++ b/examples/test/test_clusterSanity.py
@@ -5,7 +5,7 @@ A simple sanity check test for cluster edition
 '''
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 
 class clusterSanityCheck( unittest.TestCase ):
 
diff --git a/examples/test/test_controllers.py b/examples/test/test_controllers.py
index b9b93d9..abc79eb 100755
--- a/examples/test/test_controllers.py
+++ b/examples/test/test_controllers.py
@@ -5,7 +5,7 @@ Tests for controllers.py and controllers2.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 
 class testControllers( unittest.TestCase ):
 
diff --git a/examples/test/test_controlnet.py b/examples/test/test_controlnet.py
index 3a99ea4..ba22740 100755
--- a/examples/test/test_controlnet.py
+++ b/examples/test/test_controlnet.py
@@ -5,7 +5,7 @@ Test for controlnet.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 
 class testControlNet( unittest.TestCase ):
 
diff --git a/examples/test/test_cpu.py b/examples/test/test_cpu.py
index c7a6266..8b36c6e 100755
--- a/examples/test/test_cpu.py
+++ b/examples/test/test_cpu.py
@@ -15,7 +15,7 @@ cfs	10%	1.29e+09
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 import sys
 
 class testCPU( unittest.TestCase ):
diff --git a/examples/test/test_emptynet.py b/examples/test/test_emptynet.py
index f8e7c4a..aead619 100755
--- a/examples/test/test_emptynet.py
+++ b/examples/test/test_emptynet.py
@@ -5,7 +5,7 @@ Test for emptynet.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 
 class testEmptyNet( unittest.TestCase ):
 
diff --git a/examples/test/test_hwintf.py b/examples/test/test_hwintf.py
index 843fc40..e242ca3 100755
--- a/examples/test/test_hwintf.py
+++ b/examples/test/test_hwintf.py
@@ -7,7 +7,7 @@ Test for hwintf.py
 import unittest
 import re
 
-import pexpect
+from mininet.util import pexpect
 
 from mininet.log import setLogLevel
 from mininet.node import Node
diff --git a/examples/test/test_intfoptions.py b/examples/test/test_intfoptions.py
index 6f1ebec..2d72471 100755
--- a/examples/test/test_intfoptions.py
+++ b/examples/test/test_intfoptions.py
@@ -5,7 +5,7 @@ Test for intfOptions.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 import sys
 
 class testIntfOptions( unittest.TestCase ):
diff --git a/examples/test/test_limit.py b/examples/test/test_limit.py
index 2052e7e..47ceaa1 100755
--- a/examples/test/test_limit.py
+++ b/examples/test/test_limit.py
@@ -5,7 +5,7 @@ Test for limit.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 import sys
 
 class testLimit( unittest.TestCase ):
diff --git a/examples/test/test_linearbandwidth.py b/examples/test/test_linearbandwidth.py
index a18d97a..9e876bc 100755
--- a/examples/test/test_linearbandwidth.py
+++ b/examples/test/test_linearbandwidth.py
@@ -5,7 +5,7 @@ Test for linearbandwidth.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 import sys
 
 class testLinearBandwidth( unittest.TestCase ):
diff --git a/examples/test/test_linuxrouter.py b/examples/test/test_linuxrouter.py
index 60af201..f9cf648 100644
--- a/examples/test/test_linuxrouter.py
+++ b/examples/test/test_linuxrouter.py
@@ -5,7 +5,7 @@ Test for linuxrouter.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 from mininet.util import quietRun
 
 class testLinuxRouter( unittest.TestCase ):
diff --git a/examples/test/test_multilink.py b/examples/test/test_multilink.py
index 4bea8b0..0925548 100755
--- a/examples/test/test_multilink.py
+++ b/examples/test/test_multilink.py
@@ -6,7 +6,7 @@ validates mininet interfaces against systems interfaces
 '''
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 
 class testMultiLink( unittest.TestCase ):
 
diff --git a/examples/test/test_multiping.py b/examples/test/test_multiping.py
index bb5440a..2519121 100755
--- a/examples/test/test_multiping.py
+++ b/examples/test/test_multiping.py
@@ -5,7 +5,7 @@ Test for multiping.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 from collections import defaultdict
 
 class testMultiPing( unittest.TestCase ):
diff --git a/examples/test/test_multipoll.py b/examples/test/test_multipoll.py
index 61e5cec..8815033 100755
--- a/examples/test/test_multipoll.py
+++ b/examples/test/test_multipoll.py
@@ -5,7 +5,7 @@ Test for multipoll.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 
 class testMultiPoll( unittest.TestCase ):
 
diff --git a/examples/test/test_multitest.py b/examples/test/test_multitest.py
index 09172c5..4352b8e 100755
--- a/examples/test/test_multitest.py
+++ b/examples/test/test_multitest.py
@@ -5,7 +5,7 @@ Test for multitest.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 
 class testMultiTest( unittest.TestCase ):
 
diff --git a/examples/test/test_nat.py b/examples/test/test_nat.py
index c4bb096..865615f 100755
--- a/examples/test/test_nat.py
+++ b/examples/test/test_nat.py
@@ -5,7 +5,7 @@ Test for nat.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 from mininet.util import quietRun
 
 destIP = '8.8.8.8' # Google DNS
diff --git a/examples/test/test_natnet.py b/examples/test/test_natnet.py
index 3addc92..4b9e099 100644
--- a/examples/test/test_natnet.py
+++ b/examples/test/test_natnet.py
@@ -5,7 +5,7 @@ Test for natnet.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 from mininet.util import quietRun
 
 class testNATNet( unittest.TestCase ):
diff --git a/examples/test/test_numberedports.py b/examples/test/test_numberedports.py
index 81ee187..ea7d61e 100755
--- a/examples/test/test_numberedports.py
+++ b/examples/test/test_numberedports.py
@@ -5,7 +5,7 @@ Test for numberedports.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 from collections import defaultdict
 from mininet.node import OVSSwitch
 
diff --git a/examples/test/test_popen.py b/examples/test/test_popen.py
index c7f83f0..f41d531 100755
--- a/examples/test/test_popen.py
+++ b/examples/test/test_popen.py
@@ -5,7 +5,7 @@ Test for popen.py and popenpoll.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 
 class testPopen( unittest.TestCase ):
 
diff --git a/examples/test/test_scratchnet.py b/examples/test/test_scratchnet.py
index 43d8286..3d44955 100755
--- a/examples/test/test_scratchnet.py
+++ b/examples/test/test_scratchnet.py
@@ -5,7 +5,7 @@ Test for scratchnet.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 
 class testScratchNet( unittest.TestCase ):
 
diff --git a/examples/test/test_simpleperf.py b/examples/test/test_simpleperf.py
index 027c039..93a36aa 100755
--- a/examples/test/test_simpleperf.py
+++ b/examples/test/test_simpleperf.py
@@ -5,7 +5,7 @@ Test for simpleperf.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 import sys
 from mininet.log import setLogLevel
 
diff --git a/examples/test/test_sshd.py b/examples/test/test_sshd.py
index 6a39bba..193b1ea 100755
--- a/examples/test/test_sshd.py
+++ b/examples/test/test_sshd.py
@@ -5,7 +5,7 @@ Test for sshd.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 from mininet.clean import sh
 
 class testSSHD( unittest.TestCase ):
diff --git a/examples/test/test_tree1024.py b/examples/test/test_tree1024.py
index e26af2c..06f8e49 100755
--- a/examples/test/test_tree1024.py
+++ b/examples/test/test_tree1024.py
@@ -5,7 +5,7 @@ Test for tree1024.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 import sys
 
 class testTree1024( unittest.TestCase ):
diff --git a/examples/test/test_treeping64.py b/examples/test/test_treeping64.py
index ae02afc..8c346cd 100755
--- a/examples/test/test_treeping64.py
+++ b/examples/test/test_treeping64.py
@@ -5,7 +5,7 @@ Test for treeping64.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 import sys
 
 class testTreePing64( unittest.TestCase ):
diff --git a/examples/test/test_vlanhost.py b/examples/test/test_vlanhost.py
index d68448f..6781cce 100644
--- a/examples/test/test_vlanhost.py
+++ b/examples/test/test_vlanhost.py
@@ -5,7 +5,7 @@ Test for vlanhost.py
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 import sys
 from mininet.util import quietRun