Merge #11841 and other changes from default

1 files changed, 4 insertions, 4 deletions

diff --git a/distutils2/version.py b/distutils2/version.py
index 4eedb0b..7ff1c84 100644
--- a/distutils2/version.py
+++ b/distutils2/version.py
@@ -38,7 +38,7 @@ _VERSION_RE = re.compile(r'''
     $''', re.VERBOSE)
 
 
-class NormalizedVersion(object):
+class NormalizedVersion:
     """A rational version.
 
     Good:
@@ -342,7 +342,7 @@ def _split_predicate(predicate):
     return comp, NormalizedVersion(version)
 
 
-class VersionPredicate(object):
+class VersionPredicate:
     """Defines a predicate: ProjectName (>ver1,ver2, ..)"""
 
     _operators = {"<": lambda x, y: x < y,
@@ -384,7 +384,7 @@ class VersionPredicate(object):
 
     def match(self, version):
         """Check if the provided version matches the predicates."""
-        if isinstance(version, basestring):
+        if isinstance(version, str):
             version = NormalizedVersion(version)
         for operator, predicate in self.predicates:
             if not self._operators[operator](version, predicate):
@@ -444,6 +444,6 @@ def get_version_predicate(requirements):
     """Return a VersionPredicate object, from a string or an already
     existing object.
     """
-    if isinstance(requirements, basestring):
+    if isinstance(requirements, str):
         requirements = VersionPredicate(requirements)
     return requirements