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()
mininet · Jul 26, 2018 · e37afe9 · e37afe9
1 parent 6a387fa
commit e37afe9
Show file tree

Hide file tree

Showing 25 changed files with 25 additions and 25 deletions.
diff --git a/examples/test/test_bind.py b/examples/test/test_bind.py
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 '''
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -15,7 +15,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -7,7 +7,7 @@
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -6,7 +6,7 @@
 '''
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 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
@@ -5,7 +5,7 @@
 """
 
 import unittest
-import pexpect
+from mininet.util import pexpect
 import sys
 from mininet.util import quietRun