Merge feature/issue-22919.3b1

1 files changed, 5 insertions, 5 deletions

diff --git a/setuptools/dist.py b/setuptools/dist.py
index db15809d..4964a9e8 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -13,13 +13,13 @@ from distutils.core import Distribution as _Distribution
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 
+from setuptools.extern import six
+from pkg_resources.extern import packaging
+
 from setuptools.depends import Require
-from setuptools.compat import basestring, PY2
 from setuptools import windows_support
 import pkg_resources
 
-packaging = pkg_resources.packaging
-
 
 def _get_unpatched(cls):
     """Protect against re-patching the distutils if reloaded
@@ -138,7 +138,7 @@ def check_entry_points(dist, attr, value):
         raise DistutilsSetupError(e)
 
 def check_test_suite(dist, attr, value):
-    if not isinstance(value,basestring):
+    if not isinstance(value, six.string_types):
         raise DistutilsSetupError("test_suite must be a string")
 
 def check_package_data(dist, attr, value):
@@ -682,7 +682,7 @@ class Distribution(_Distribution):
         """
         import sys
 
-        if PY2 or self.help_commands:
+        if six.PY2 or self.help_commands:
             return _Distribution.handle_display_options(self, option_order)
 
         # Stdout may be StringIO (e.g. in tests)