Prefer io.BytesIO over six; available on all supported Pythons (#45388)

On all supported Pythons, the io.BytesIO is always a stream
implementation using an in-memory bytes buffer. Makes code slightly more
forward compatible by reducing use of the six module.
This commit is contained in:
Jon Dufresne 2018-09-10 12:19:16 -07:00 committed by Nathaniel Case
parent 371d9596f4
commit ef67d4074b
3 changed files with 7 additions and 3 deletions

View file

@ -140,9 +140,11 @@ options:
- name: ANSIBLE_PERSISTENT_COMMAND_TIMEOUT
"""
from io import BytesIO
from ansible.errors import AnsibleConnectionFailure
from ansible.module_utils._text import to_bytes
from ansible.module_utils.six import PY3, BytesIO
from ansible.module_utils.six import PY3
from ansible.module_utils.six.moves import cPickle
from ansible.module_utils.six.moves.urllib.error import HTTPError, URLError
from ansible.module_utils.urls import open_url

View file

@ -166,9 +166,10 @@ import re
import os
import socket
import traceback
from io import BytesIO
from ansible.errors import AnsibleConnectionFailure
from ansible.module_utils.six import BytesIO, PY3
from ansible.module_utils.six import PY3
from ansible.module_utils.six.moves import cPickle
from ansible.module_utils.network.common.utils import to_list
from ansible.module_utils._text import to_bytes, to_text

View file

@ -18,6 +18,7 @@
import json
import os
from io import BytesIO
from ansible.module_utils.six.moves.urllib.error import HTTPError
@ -28,7 +29,7 @@ from ansible.errors import AnsibleConnectionFailure
from ansible.module_utils.connection import ConnectionError
from ansible.module_utils.network.ftd.common import HTTPMethod, ResponseParams
from ansible.module_utils.network.ftd.fdm_swagger_client import SpecProp, FdmSwaggerParser
from ansible.module_utils.six import BytesIO, PY3, StringIO
from ansible.module_utils.six import PY3, StringIO
from ansible.plugins.httpapi.ftd import HttpApi
if PY3: