Drop six

Reverts #7710

Author: stsewd

readthedocs/doc_builder/python_environments.py

@@ -364,7 +364,6 @@ def install_core_requirements(self):
             'mock==1.0.1',
             'pillow==5.4.1',
             'alabaster>=0.7,<0.8,!=0.7.5',
-            'six',
             'commonmark==0.8.1',
             'recommonmark==0.5.0',
         ]
@@ -658,7 +657,6 @@ def _get_core_requirements(self):
         # Install pip-only things.
         pip_requirements = [
             'recommonmark',
-            'six',
         ]
 
         if self.config.doctype == 'mkdocs':

readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl

@@ -17,7 +17,9 @@
 import importlib
 import sys
 import os.path
-from six import string_types
+
+PY3 = sys.version_info[0] == 3
+string_types = str if PY3 else basestring
 
 from sphinx import version_info
 

readthedocs/rtd_tests/tests/test_doc_building.py

@@ -1194,7 +1194,6 @@ def setUp(self):
             'mock',
             'pillow',
             'alabaster',
-            'six',
         ]
         self.base_conda_requirements = [
             'mock',
@@ -1374,7 +1373,6 @@ def test_install_core_requirements_sphinx_conda(self, checkout_path):
         conda_requirements = self.base_conda_requirements + conda_sphinx
         pip_requirements = [
             'recommonmark',
-            'six',
             'readthedocs-sphinx-ext',
         ]
 
@@ -1416,7 +1414,6 @@ def test_install_core_requirements_mkdocs_conda(self, checkout_path):
         conda_requirements = self.base_conda_requirements
         pip_requirements = [
             'recommonmark',
-            'six',
             'mkdocs',
         ]