Restore compatibility with aix_support on Python 3.8 and earlier. Fixes

pypa/setuptools#2358.
pypa · Sep 1, 2020 · 607b411 · 607b411
1 parent cdcdda0
commit 607b411
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/distutils/py38compat.py b/distutils/py38compat.py
@@ -0,0 +1,7 @@
+def aix_platform(osname, version, release):
+	try:
+        import _aix_support
+		return _aix_support.aix_platform()
+	except ImportError:
+		pass
+    return "%s-%s.%s" % (osname, version, release)
diff --git a/distutils/util.py b/distutils/util.py
@@ -79,8 +79,8 @@ def get_host_platform():
             machine += ".%s" % bitness[sys.maxsize]
         # fall through to standard osname-release-machine representation
     elif osname[:3] == "aix":
-        from _aix_support import aix_platform
-        return aix_platform()
+        from .py38compat import aix_platform
+        return aix_platform(osname, version, release)
     elif osname[:6] == "cygwin":
         osname = "cygwin"
         rel_re = re.compile (r'[\d.]+', re.ASCII)