python/samba/tests: Use io.StringIO for py3 and StringIO.StrinIO for py2

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/gpclass.py b/python/samba/gpclass.py
index 8fb2f9344a6a3aead8ce963042746e23fc051223..3cf1f10dbe39874f27608289861d6a680433ca4b 100644 (file)
--- a/python/samba/gpclass.py
+++ b/python/samba/gpclass.py
@@ -22,7 +22,7 @@ import tdb
 sys.path.insert(0, "bin/python")
 from samba import NTSTATUSError
 from ConfigParser import ConfigParser
-from StringIO import StringIO
+from samba.compat import StringIO
 from abc import ABCMeta, abstractmethod
 import xml.etree.ElementTree as etree
 import re

diff --git a/python/samba/tests/blackbox/samba_dnsupdate.py b/python/samba/tests/blackbox/samba_dnsupdate.py
index 56416330e72ff5d5657b891d300c66878c7e3df2..d5f70ea52375b5a2c44cea73c4275385ac8c32e2 100644 (file)
--- a/python/samba/tests/blackbox/samba_dnsupdate.py
+++ b/python/samba/tests/blackbox/samba_dnsupdate.py
@@ -17,7 +17,7 @@
 #
 
 import samba.tests
-from StringIO import StringIO
+from samba.compat import StringIO
 from samba.netcmd.main import cmd_sambatool
 from samba.credentials import Credentials
 from samba.auth import system_session

diff --git a/python/samba/tests/emulate/traffic.py b/python/samba/tests/emulate/traffic.py
index a57c2f5bc4eb4a3509739e62ea0250001d4108f0..0cfae02bce0ea407634d870e7240c9e249d2cd20 100644 (file)
--- a/python/samba/tests/emulate/traffic.py
+++ b/python/samba/tests/emulate/traffic.py
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # from pprint import pprint
-from cStringIO import StringIO
+from samba.compat import StringIO
 
 import samba.tests
 

diff --git a/python/samba/tests/netcmd.py b/python/samba/tests/netcmd.py
index 433bf3977c8ec90103beb90e8db6cce2496b3a1a..8efd47c18ff2ac5e4fcc7e9182282cc68ae8e70b 100644 (file)
--- a/python/samba/tests/netcmd.py
+++ b/python/samba/tests/netcmd.py
@@ -17,7 +17,7 @@
 
 """Tests for samba.netcmd."""
 
-from cStringIO import StringIO
+from samba.compat import StringIO
 from samba.netcmd import Command
 from samba.netcmd.testparm import cmd_testparm
 from samba.netcmd.main import cmd_sambatool

diff --git a/python/samba/tests/samba_tool/base.py b/python/samba/tests/samba_tool/base.py
index 95e4e7d792b28a60819e974a87221eba8ee8a820..2aee4816fc457694449442054b4b62f09e535ba4 100644 (file)
--- a/python/samba/tests/samba_tool/base.py
+++ b/python/samba/tests/samba_tool/base.py
@@ -25,7 +25,7 @@ import random
 import string
 from samba.auth import system_session
 from samba.samdb import SamDB
-from cStringIO import StringIO
+from samba.compat import StringIO
 from samba.netcmd.main import cmd_sambatool
 import samba.tests