Merge branch 'master' into feature/implicit-bootstrapfeature/implicit-bootstrap

1 files changed, 3 insertions, 6 deletions

diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 2a0e9c86..82bdb9c6 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -7,19 +7,16 @@ import shutil
 import sys
 import tempfile
 import itertools
+import io
 from distutils import log
 from distutils.errors import DistutilsTemplateError
 
-import pkg_resources.py31compat
 from setuptools.command.egg_info import FileList, egg_info, translate_pattern
 from setuptools.dist import Distribution
-from setuptools.extern import six
 from setuptools.tests.textwrap import DALS
 
 import pytest
 
-__metaclass__ = type
-
 
 def make_local_path(s):
     """Converts '/' in a string to os.sep"""
@@ -42,7 +39,7 @@ setup(**%r)
 @contextlib.contextmanager
 def quiet():
     old_stdout, old_stderr = sys.stdout, sys.stderr
-    sys.stdout, sys.stderr = six.StringIO(), six.StringIO()
+    sys.stdout, sys.stderr = io.StringIO(), io.StringIO()
     try:
         yield
     finally:
@@ -364,7 +361,7 @@ class TestFileListTest(TempDirTestCase):
         for file in files:
             file = os.path.join(self.temp_dir, file)
             dirname, basename = os.path.split(file)
-            pkg_resources.py31compat.makedirs(dirname, exist_ok=True)
+            os.makedirs(dirname, exist_ok=True)
             open(file, 'w').close()
 
     def test_process_template_line(self):