Skip to content

Commit d0eb552

Browse files
committed
Accept missing abiflags again and always drop 'm'
1 parent 2ecec0e commit d0eb552

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

‎src/embed_tests/TestNativeTypeOffset.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void LoadNativeTypeOffsetClass()
3535
{
3636
PyObject sys = Py.Import("sys");
3737
// We can safely ignore the "m" abi flag
38-
var abiflags = sys.GetAttr("abiflags").ToString().Replace("m", "");
38+
var abiflags = sys.GetAttr("abiflags", "".ToPython()).ToString().Replace("m", "");
3939
if (!string.IsNullOrEmpty(abiflags))
4040
{
4141
string typeName = "Python.Runtime.NativeTypeOffset, Python.Runtime";

‎tools/geninterop/geninterop.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,6 @@ def preprocess_python_headers():
225225
if hasattr(sys, "abiflags"):
226226
if "d" in sys.abiflags:
227227
defines.extend(("-D", "PYTHON_WITH_PYDEBUG"))
228-
if "m" in sys.abiflags:
229-
defines.extend(("-D", "PYTHON_WITH_PYMALLOC"))
230228
if "u" in sys.abiflags:
231229
defines.extend(("-D", "PYTHON_WITH_WIDE_UNICODE"))
232230

@@ -245,7 +243,7 @@ def preprocess_python_headers():
245243

246244
def gen_interop_head(writer):
247245
filename = os.path.basename(__file__)
248-
abi_flags = getattr(sys, "abiflags", "")
246+
abi_flags = getattr(sys, "abiflags", "").replace("m", "")
249247
py_ver = "{0}.{1}".format(PY_MAJOR, PY_MINOR)
250248
class_definition = """
251249
// Auto-generated by %s.

0 commit comments

Comments
 (0)