From fd1dd13a508900b17dc99f9c66a554e2d06bed09 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sat, 15 Dec 2018 20:03:39 +0900
Subject: [PATCH] refactor: Replace six.StringIO by io.StringIO

---
 sphinx/builders/gettext.py                      | 3 +--
 sphinx/ext/doctest.py                           | 2 +-
 sphinx/pycode/__init__.py                       | 4 +---
 sphinx/setup_command.py                         | 3 +--
 sphinx/testing/fixtures.py                      | 2 +-
 sphinx/util/inspect.py                          | 3 +--
 tests/roots/test-ext-autodoc/target/__init__.py | 3 +--
 tests/roots/test-root/autodoc_target.py         | 3 +--
 tests/test_ext_autosummary.py                   | 3 ++-
 tests/test_io.py                                | 3 ++-
 tests/test_quickstart.py                        | 3 ++-
 11 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index 684013d11..0ca40708b 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -14,12 +14,11 @@ from __future__ import unicode_literals
 from codecs import open
 from collections import defaultdict, OrderedDict
 from datetime import datetime, tzinfo, timedelta
+from io import StringIO
 from os import path, walk, getenv
 from time import time
 from uuid import uuid4
 
-from six import StringIO
-
 from sphinx.builders import Builder
 from sphinx.domains.python import pairindextypes
 from sphinx.errors import ThemeError
diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py
index fd4f7025d..d6ffb40e6 100644
--- a/sphinx/ext/doctest.py
+++ b/sphinx/ext/doctest.py
@@ -16,13 +16,13 @@ import re
 import sys
 import time
 import warnings
+from io import StringIO
 from os import path
 
 from docutils import nodes
 from docutils.parsers.rst import directives
 from packaging.specifiers import SpecifierSet, InvalidSpecifier
 from packaging.version import Version
-from six import StringIO
 
 import sphinx
 from sphinx.builders import Builder
diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index fe6b5f7e1..a1b2d0273 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -11,11 +11,9 @@
 from __future__ import print_function
 
 import re
-from io import BytesIO
+from io import BytesIO, StringIO
 from zipfile import ZipFile
 
-from six import StringIO
-
 from sphinx.errors import PycodeError
 from sphinx.pycode.parser import Parser
 from sphinx.util import get_module_source, detect_encoding
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py
index 87944167a..b8efc13e6 100644
--- a/sphinx/setup_command.py
+++ b/sphinx/setup_command.py
@@ -17,8 +17,7 @@ import os
 import sys
 from distutils.cmd import Command
 from distutils.errors import DistutilsOptionError, DistutilsExecError
-
-from six import StringIO
+from io import StringIO
 
 from sphinx.application import Sphinx
 from sphinx.cmd.build import handle_exception
diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py
index 968807788..e338fe937 100644
--- a/sphinx/testing/fixtures.py
+++ b/sphinx/testing/fixtures.py
@@ -14,10 +14,10 @@ import os
 import subprocess
 import sys
 from collections import namedtuple
+from io import StringIO
 from tempfile import gettempdir
 
 import pytest
-from six import StringIO
 
 from . import util
 
diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py
index eeedf77ab..603fa88ae 100644
--- a/sphinx/util/inspect.py
+++ b/sphinx/util/inspect.py
@@ -17,8 +17,7 @@ import re
 import sys
 import typing
 from functools import partial
-
-from six import StringIO
+from io import StringIO
 
 from sphinx.util import logging
 from sphinx.util.pycompat import NoneType
diff --git a/tests/roots/test-ext-autodoc/target/__init__.py b/tests/roots/test-ext-autodoc/target/__init__.py
index 0f8d555e8..908411c22 100644
--- a/tests/roots/test-ext-autodoc/target/__init__.py
+++ b/tests/roots/test-ext-autodoc/target/__init__.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import enum
-
-from six import StringIO
+from io import StringIO
 
 from sphinx.util import save_traceback  # NOQA
 
diff --git a/tests/roots/test-root/autodoc_target.py b/tests/roots/test-root/autodoc_target.py
index c18e093ee..6aaf9ee16 100644
--- a/tests/roots/test-root/autodoc_target.py
+++ b/tests/roots/test-root/autodoc_target.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import enum
-
-from six import StringIO
+from io import StringIO
 
 
 __all__ = ['Class']
diff --git a/tests/test_ext_autosummary.py b/tests/test_ext_autosummary.py
index e75fb71fd..069fdb722 100644
--- a/tests/test_ext_autosummary.py
+++ b/tests/test_ext_autosummary.py
@@ -9,8 +9,9 @@
     :license: BSD, see LICENSE for details.
 """
 
+from io import StringIO
+
 import pytest
-from six import StringIO
 
 from sphinx.ext.autosummary import mangle_signature, import_by_name, extract_summary
 from sphinx.testing.util import etree_parse
diff --git a/tests/test_io.py b/tests/test_io.py
index 1c8fee86b..2e81035dc 100644
--- a/tests/test_io.py
+++ b/tests/test_io.py
@@ -9,8 +9,9 @@
     :license: BSD, see LICENSE for details.
 """
 
+from io import StringIO
+
 import pytest
-from six import StringIO
 
 from sphinx.io import SphinxRSTFileInput
 
diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py
index 31533cff0..248b91d64 100644
--- a/tests/test_quickstart.py
+++ b/tests/test_quickstart.py
@@ -11,9 +11,10 @@
 
 import sys
 import time
+from io import StringIO
 
 import pytest
-from six import text_type, StringIO
+from six import text_type
 
 from sphinx import application
 from sphinx.cmd import quickstart as qs