Fix Python 3.12 build issues in thrift Python

greggdonovan · claude · greggdonovan · commit ed73c2067d3e · 2026-01-04T19:33:06.000Z
- Add pyproject.toml with setuptools build requirement for PEP 517 compliance - Replace distutils imports with setuptools equivalents - Use setuptools error names directly (CompileError, ExecError, PlatformError) - Fix macOS header collision with ntohll/htonll macros in endian.h This fixes the ModuleNotFoundError: No module named 'distutils' error when building thrift with Python 3.12+. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/contrib/fb303/py/setup.py b/contrib/fb303/py/setup.py
@@ -20,10 +20,8 @@
 #
 
 import sys
-try:
-    from setuptools import setup, Extension
-except:
-    from distutils.core import setup, Extension, Command
+
+from setuptools import Extension, setup
 
 setup(name='thrift_fb303',
       version='1.0.0',
diff --git a/lib/py/pyproject.toml b/lib/py/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
diff --git a/lib/py/setup.py b/lib/py/setup.py
@@ -20,13 +20,10 @@
 #
 
 import sys
-try:
-    from setuptools import setup, Extension
-except Exception:
-    from distutils.core import setup, Extension
 
-from distutils.command.build_ext import build_ext
-from distutils.errors import CCompilerError, DistutilsExecError, DistutilsPlatformError
+from setuptools import Extension, setup
+from setuptools.command.build_ext import build_ext
+from setuptools.errors import CompileError, ExecError, PlatformError
 
 # Fix to build sdist under vagrant
 import os
@@ -39,9 +36,9 @@
 include_dirs = ['src']
 if sys.platform == 'win32':
     include_dirs.append('compat/win32')
-    ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError, IOError)
+    ext_errors = (CompileError, ExecError, PlatformError, IOError)
 else:
-    ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError)
+    ext_errors = (CompileError, ExecError, PlatformError)
 
 
 class BuildFailed(Exception):
@@ -52,7 +49,7 @@ class ve_build_ext(build_ext):
     def run(self):
         try:
             build_ext.run(self)
-        except DistutilsPlatformError:
+        except PlatformError:
             raise BuildFailed()
 
     def build_extension(self, ext):
diff --git a/lib/py/src/ext/endian.h b/lib/py/src/ext/endian.h
@@ -29,6 +29,7 @@
 #else
 #include <netinet/in.h>
 
+#ifndef ntohll
 static inline unsigned long long ntohll(unsigned long long n) {
   union {
     unsigned long long f;
@@ -43,8 +44,11 @@ static inline unsigned long long ntohll(unsigned long long n) {
          | static_cast<unsigned long long>(u.t[5]) << 16
          | static_cast<unsigned long long>(u.t[6]) << 8 | static_cast<unsigned long long>(u.t[7]);
 }
+#endif
 
+#ifndef htonll
 #define htonll(n) ntohll(n)
+#endif
 
 #endif // !_WIN32
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[build-system]`
	`2`	`+requires = ["setuptools>=61.0"]`
	`3`	`+build-backend = "setuptools.build_meta"`