Fix embarassing off-by-one error in error report

encukou · encukou · commit 4e05b9b135cd · 2026-03-31T13:27:30.000+02:00
diff --git a/Python/modsupport.c b/Python/modsupport.c
@@ -735,15 +735,15 @@ int PyABIInfo_Check(PyABIInfo *info, const char *module_name)
                 return _abiinfo_raise(
                     module_name,
                     "incompatible future stable ABI version (%d.%d)",
-                    ((info->abi_version) >> 24) % 0xff,
-                    ((info->abi_version) >> 16) % 0xff);
+                    ((info->abi_version) >> 24) & 0xff,
+                    ((info->abi_version) >> 16) & 0xff);
             }
             if (info->abi_version < Py_PACK_VERSION(3, 2)) {
                 return _abiinfo_raise(
                     module_name,
                     "invalid stable ABI version (%d.%d)",
-                    ((info->abi_version) >> 24) % 0xff,
-                    ((info->abi_version) >> 16) % 0xff);
+                    ((info->abi_version) >> 24) & 0xff,
+                    ((info->abi_version) >> 16) & 0xff);
             }
         }
         if (info->flags & PyABIInfo_INTERNAL) {
@@ -758,8 +758,8 @@ int PyABIInfo_Check(PyABIInfo *info, const char *module_name)
                 return _abiinfo_raise(
                     module_name,
                     "incompatible ABI version (%d.%d)",
-                    ((info->abi_version) >> 24) % 0xff,
-                    ((info->abi_version) >> 16) % 0xff);
+                    ((info->abi_version) >> 24) & 0xff,
+                    ((info->abi_version) >> 16) & 0xff);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -735,15 +735,15 @@ int PyABIInfo_Check(PyABIInfo info, const char module_name)`
`735`	`735`	`return _abiinfo_raise(`
`736`	`736`	`module_name,`
`737`	`737`	`"incompatible future stable ABI version (%d.%d)",`
`738`		`- ((info->abi_version) >> 24) % 0xff,`
`739`		`- ((info->abi_version) >> 16) % 0xff);`
	`738`	`+ ((info->abi_version) >> 24) & 0xff,`
	`739`	`+ ((info->abi_version) >> 16) & 0xff);`
`740`	`740`	`}`
`741`	`741`	`if (info->abi_version < Py_PACK_VERSION(3, 2)) {`
`742`	`742`	`return _abiinfo_raise(`
`743`	`743`	`module_name,`
`744`	`744`	`"invalid stable ABI version (%d.%d)",`
`745`		`- ((info->abi_version) >> 24) % 0xff,`
`746`		`- ((info->abi_version) >> 16) % 0xff);`
	`745`	`+ ((info->abi_version) >> 24) & 0xff,`
	`746`	`+ ((info->abi_version) >> 16) & 0xff);`
`747`	`747`	`}`
`748`	`748`	`}`
`749`	`749`	`if (info->flags & PyABIInfo_INTERNAL) {`
`@@ -758,8 +758,8 @@ int PyABIInfo_Check(PyABIInfo info, const char module_name)`
`758`	`758`	`return _abiinfo_raise(`
`759`	`759`	`module_name,`
`760`	`760`	`"incompatible ABI version (%d.%d)",`
`761`		`- ((info->abi_version) >> 24) % 0xff,`
`762`		`- ((info->abi_version) >> 16) % 0xff);`
	`761`	`+ ((info->abi_version) >> 24) & 0xff,`
	`762`	`+ ((info->abi_version) >> 16) & 0xff);`
`763`	`763`	`}`
`764`	`764`	`}`
`765`	`765`	`}`