From: Noel Power <noel.power@suse.com>
Date: Fri, 4 May 2018 10:49:23 +0000 (+0100)
Subject: python/samba/tests: Use io.StringIO for py3 and StringIO.StrinIO for py2
X-Git-Tag: tdb-1.3.17~1937
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=563c10ee63c401345bed707b9f14b41d5d2799f7;p=thirdparty%2Fsamba.git

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 8fb2f9344a6..3cf1f10dbe3 100644
--- 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 56416330e72..d5f70ea5237 100644
--- 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 a57c2f5bc4e..0cfae02bce0 100644
--- 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 433bf3977c8..8efd47c18ff 100644
--- 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 95e4e7d792b..2aee4816fc4 100644
--- 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