python compat: remove StringIO

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>

buildtools/wafsamba/tests/test_abi.py

@@ -21,7 +21,7 @@ from wafsamba.samba_abi import (
     normalise_signature,
     )
 
-from samba.compat import StringIO
+from io import StringIO
 
 
 class NormaliseSignatureTests(TestCase):

python/samba/compat.py

@@ -76,8 +76,6 @@ if PY3:
     binary_type = bytes
 
     # alias
-    import io
-    StringIO = io.StringIO
     def ConfigParser(defaults=None, dict_type=dict, allow_no_value=False):
         from configparser import ConfigParser
         return ConfigParser(defaults, dict_type, allow_no_value, interpolation=None)

python/samba/gp_parse/gp_ini.py

@@ -23,7 +23,7 @@ import re
 
 from xml.etree.ElementTree import Element, SubElement
 from samba.compat import ConfigParser
-from samba.compat import StringIO
+from io import StringIO
 
 from samba.gp_parse import GPParser, ENTITY_USER_ID
 

python/samba/gpclass.py

@@ -22,7 +22,7 @@ import tdb
 sys.path.insert(0, "bin/python")
 from samba import NTSTATUSError
 from samba.compat import ConfigParser
-from samba.compat import StringIO
+from io import StringIO
 from samba.compat import get_bytes
 from abc import ABCMeta, abstractmethod
 import xml.etree.ElementTree as etree

python/samba/tests/blackbox/samba_dnsupdate.py

@@ -17,7 +17,7 @@
 #
 
 import samba.tests
-from samba.compat import StringIO
+from io import StringIO
 from samba.compat import get_string
 from samba.netcmd.main import cmd_sambatool
 from samba.credentials import Credentials

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 samba.compat import StringIO
+from io import StringIO
 
 import samba.tests
 

python/samba/tests/netcmd.py

@@ -17,7 +17,7 @@
 
 """Tests for samba.netcmd."""
 
-from samba.compat import StringIO
+from io import StringIO
 from samba.netcmd import Command
 from samba.netcmd.testparm import cmd_testparm
 from samba.netcmd.main import cmd_sambatool

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 samba.compat import StringIO
+from io import StringIO
 from samba.netcmd.main import cmd_sambatool
 import samba.tests