Merge feature/issue-22919.3b1

1 files changed, 4 insertions, 3 deletions

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index c26f5fc9..3a2a9b93 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -2,11 +2,12 @@ from distutils.errors import DistutilsOptionError
 from unittest import TestLoader
 import sys
 
+from setuptools.extern import six
+
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages,
                            add_activation_listener, require, EntryPoint)
 from setuptools import Command
-from setuptools.compat import PY3
 from setuptools.py31compat import unittest_main
 
 
@@ -100,7 +101,7 @@ class test(Command):
             yield self.test_suite
 
     def with_project_on_sys_path(self, func):
-        with_2to3 = PY3 and getattr(self.distribution, 'use_2to3', False)
+        with_2to3 = six.PY3 and getattr(self.distribution, 'use_2to3', False)
 
         if with_2to3:
             # If we run 2to3 we can not do this inplace:
@@ -160,7 +161,7 @@ class test(Command):
         # Purge modules under test from sys.modules. The test loader will
         # re-import them from the build location. Required when 2to3 is used
         # with namespace packages.
-        if PY3 and getattr(self.distribution, 'use_2to3', False):
+        if six.PY3 and getattr(self.distribution, 'use_2to3', False):
             module = self.test_suite.split('.')[0]
             if module in _namespace_packages:
                 del_modules = []