diff --git a/sphinx_feature_classification/support_matrix.py b/sphinx_feature_classification/support_matrix.py index ca7d7d2..1135052 100644 --- a/sphinx_feature_classification/support_matrix.py +++ b/sphinx_feature_classification/support_matrix.py @@ -18,14 +18,12 @@ It is used via a single directive in the .rst file .. support_matrix:: """ - +import configparser from os import path import re from docutils import nodes from docutils.parsers import rst -import six -from six.moves import configparser from sphinx.util.fileutil import copy_asset KEY_PATTERN = re.compile("[^a-zA-Z0-9_]") @@ -222,11 +220,6 @@ class Directive(rst.Directive): fname = self.arguments[0] rel_fpath, fpath = env.relfn2path(fname) - # Handle deprecation of readfp in py3 for read_file that was not - # available in py2. - if six.PY2: - cfg.read_file = cfg.readfp - with open(fpath) as fp: cfg.read_file(fp) diff --git a/sphinx_feature_classification/tests/test_sphinx_feature_classification.py b/sphinx_feature_classification/tests/test_sphinx_feature_classification.py index b385073..e60fbe2 100644 --- a/sphinx_feature_classification/tests/test_sphinx_feature_classification.py +++ b/sphinx_feature_classification/tests/test_sphinx_feature_classification.py @@ -18,12 +18,11 @@ test_sphinx_feature_classification Tests for `sphinx_feature_classification` module. """ +import configparser import os import ddt import fixtures -import six -from six.moves import configparser from sphinx_feature_classification import support_matrix from sphinx_feature_classification.tests import base @@ -39,9 +38,6 @@ class MatrixTestCase(base.TestCase): directory = os.path.dirname(os.path.abspath(__file__)) config_file = os.path.join(directory, 'fakes', 'support-matrix.ini') - if six.PY2: - cfg.read_file = cfg.readfp - with open(config_file) as fp: cfg.read_file(fp)