diff options
author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2020-07-04 13:53:34 +1200 |
---|---|---|
committer | Noel Power <npower@samba.org> | 2020-08-11 16:37:35 +0000 |
commit | 4d9d63b000db28c3b718f7f1dbddac5a94685687 (patch) | |
tree | c3b14bc90bbe381645155c04f73b49b65434516b | |
parent | 9cc65a552b0270db0ea08509ee6e9a3d5b9a1f10 (diff) | |
download | samba-4d9d63b000db28c3b718f7f1dbddac5a94685687.tar.gz |
python compat: remove StringIO
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
-rw-r--r-- | buildtools/wafsamba/tests/test_abi.py | 2 | ||||
-rw-r--r-- | python/samba/compat.py | 2 | ||||
-rw-r--r-- | python/samba/gp_parse/gp_ini.py | 2 | ||||
-rw-r--r-- | python/samba/gpclass.py | 2 | ||||
-rw-r--r-- | python/samba/tests/blackbox/samba_dnsupdate.py | 2 | ||||
-rw-r--r-- | python/samba/tests/emulate/traffic.py | 2 | ||||
-rw-r--r-- | python/samba/tests/netcmd.py | 2 | ||||
-rw-r--r-- | python/samba/tests/samba_tool/base.py | 2 |
8 files changed, 7 insertions, 9 deletions
diff --git a/buildtools/wafsamba/tests/test_abi.py b/buildtools/wafsamba/tests/test_abi.py index 8521c49d8e8..ffd5a568e1b 100644 --- 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 01849e0eef5..c675702ca95 100644 --- 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 590b71b9a6c..d567addd3ea 100644 --- 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 b100f87ff10..e8cefff9568 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 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 3e168bc00d9..4360f741217 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 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 eb1276b55d1..63fbd103395 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 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 cdc4e3b0c22..08d5bda8dda 100644 --- 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 58d9b3d6b9f..536fbfc1617 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 samba.compat import StringIO +from io import StringIO from samba.netcmd.main import cmd_sambatool import samba.tests |