python compat: remove StringIO

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

diff --git a/buildtools/wafsamba/tests/test_abi.py b/buildtools/wafsamba/tests/test_abi.py
index 8521c49d8e82b4b311863fb8b34884ecb7ef07fc..ffd5a568e1b5992391817bbd52eada271448f44c 100644 (file)
--- a/buildtools/wafsamba/tests/test_abi.py
+++ b/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):

diff --git a/python/samba/compat.py b/python/samba/compat.py
index 01849e0eef549872383452678bcd52ff85f38a75..c675702ca95117844ad5ba01c0c5d8f8776c6def 100644 (file)
--- a/python/samba/compat.py
+++ b/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)

diff --git a/python/samba/gp_parse/gp_ini.py b/python/samba/gp_parse/gp_ini.py
index 590b71b9a6c966c8a9dc19801a99458045b0bdb6..d567addd3ea94b8f9a0c3181bafef5ab4838d546 100644 (file)
--- a/python/samba/gp_parse/gp_ini.py
+++ b/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
 

diff --git a/python/samba/gpclass.py b/python/samba/gpclass.py
index b100f87ff1066bbbf739b3c05cbc11004655cf0e..e8cefff9568de7a7553e6ee54ac9f3adc8aa36ca 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 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

diff --git a/python/samba/tests/blackbox/samba_dnsupdate.py b/python/samba/tests/blackbox/samba_dnsupdate.py
index 3e168bc00d900de7f8b46f785d38a3e765fbff2e..4360f741217b67734e19ac7dd9244a2fc14e2729 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 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

diff --git a/python/samba/tests/emulate/traffic.py b/python/samba/tests/emulate/traffic.py
index eb1276b55d15cfa09e316ed1d171c5bb68421403..63fbd10339599f4d7780f05956da7711138d4c35 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 samba.compat import StringIO
+from io import StringIO
 
 import samba.tests
 

diff --git a/python/samba/tests/netcmd.py b/python/samba/tests/netcmd.py
index cdc4e3b0c22cc3142eecb10be0faea479464eef6..08d5bda8dda2f8733ecd88d498c5429c175aa998 100644 (file)
--- a/python/samba/tests/netcmd.py
+++ b/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

diff --git a/python/samba/tests/samba_tool/base.py b/python/samba/tests/samba_tool/base.py
index 58d9b3d6b9f0489c4a12f61ef04a4b551b7a6565..536fbfc16170ca7480a3803f66a9005cbd9aa079 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 samba.compat import StringIO
+from io import StringIO
 from samba.netcmd.main import cmd_sambatool
 import samba.tests