More default Python version cleanups

Author: mhsmith

product/gradle-plugin/src/main/python/chaquopy_monkey.py

@@ -1,6 +1,7 @@
 import os
 import sys
 import types
+from importlib import import_module
 
 
 # We want to cause a quick and comprehensible failure when a package attempts to build
@@ -59,7 +60,16 @@ def disable_native_distutils():
     from distutils import ccompiler
     from distutils.unixccompiler import UnixCCompiler
 
-    ccompiler.get_default_compiler = lambda *args, **kwargs: "disabled"
+    # In newer versions of Setuptools, ccompiler imports all of its symbols from
+    # elsewhere.
+    compiler_mods = [ccompiler]
+    original_mod_name = ccompiler.get_default_compiler.__module__
+    if original_mod_name != ccompiler.__name__:
+        compiler_mods.append(import_module(original_mod_name))
+
+    for mod in compiler_mods:
+        mod.get_default_compiler = lambda *args, **kwargs: "disabled"
+
     ccompiler.compiler_class["disabled"] = (
         "disabledcompiler", "DisabledCompiler",
         "Compiler disabled ({})".format(CHAQUOPY_NATIVE_ERROR))

product/gradle-plugin/src/test/integration/test_gradle_plugin.py

@@ -1012,7 +1012,7 @@ def test_download_wheel(self):
         # Our current version of pip shows the full URL for custom indexes, but only
         # the filename for PyPI.
         CHAQUO_URL = (r"https://chaquo.com/pypi-13.1/murmurhash/"
-                      r"murmurhash-0.28.0-7-cp38-cp38-android_16_x86.whl")
+                      r"murmurhash-0.28.0-7-cp310-cp310-android_16_x86.whl")
         PYPI_URL = "six-1.14.0-py2.py3-none-any.whl"
 
         common_reqs = (["murmurhash/" + name for name in