Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Modules/_testcapi/watchers.c
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ add_code_watcher(PyObject *self, PyObject *which_watcher)
watcher_id = PyCode_AddWatcher(error_code_event_handler);
}
else {
PyErr_Format(PyExc_ValueError, "invalid watcher %d", which_l);
PyErr_Format(PyExc_ValueError, "invalid watcher %ld", which_l);
return NULL;
}
if (watcher_id < 0) {
Expand Down Expand Up @@ -673,7 +673,7 @@ add_context_watcher(PyObject *self, PyObject *which_watcher)
assert(PyLong_Check(which_watcher));
long which_l = PyLong_AsLong(which_watcher);
if (which_l < 0 || which_l >= (long)Py_ARRAY_LENGTH(callbacks)) {
PyErr_Format(PyExc_ValueError, "invalid watcher %d", which_l);
PyErr_Format(PyExc_ValueError, "invalid watcher %ld", which_l);
return NULL;
}
int watcher_id = PyContext_AddWatcher(callbacks[which_l]);
Expand Down
4 changes: 2 additions & 2 deletions Modules/_testcapimodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ test_sizeof_c_types(PyObject *self, PyObject *Py_UNUSED(ignored))
do { \
if (EXPECTED != sizeof(TYPE)) { \
PyErr_Format(get_testerror(self), \
"sizeof(%s) = %u instead of %u", \
#TYPE, sizeof(TYPE), EXPECTED); \
"sizeof(%s) = %zu instead of %u", \
#TYPE, sizeof(TYPE), (unsigned)(EXPECTED)); \
return (PyObject*)NULL; \
} \
} while (0)
Expand Down
8 changes: 4 additions & 4 deletions Modules/_testinternalcapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,14 +417,14 @@ test_bswap(PyObject *self, PyObject *Py_UNUSED(args))
uint16_t u16 = _Py_bswap16(UINT16_C(0x3412));
if (u16 != UINT16_C(0x1234)) {
PyErr_Format(PyExc_AssertionError,
"_Py_bswap16(0x3412) returns %u", u16);
"_Py_bswap16(0x3412) returns %d", u16);
return NULL;
}

uint32_t u32 = _Py_bswap32(UINT32_C(0x78563412));
if (u32 != UINT32_C(0x12345678)) {
PyErr_Format(PyExc_AssertionError,
"_Py_bswap32(0x78563412) returns %lu", u32);
"_Py_bswap32(0x78563412) returns %u", u32);
return NULL;
}

Expand Down Expand Up @@ -703,7 +703,7 @@ test_edit_cost(PyObject *self, PyObject *Py_UNUSED(args))

static int
check_bytes_find(const char *haystack0, const char *needle0,
int offset, Py_ssize_t expected)
Py_ssize_t offset, Py_ssize_t expected)
{
Py_ssize_t len_haystack = strlen(haystack0);
Py_ssize_t len_needle = strlen(needle0);
Expand Down Expand Up @@ -1158,7 +1158,7 @@ get_interp_settings(PyObject *self, PyObject *args)
}
else {
PyErr_Format(PyExc_NotImplementedError,
"%zd", interpid);
"%d", interpid);
return NULL;
}
assert(interp != NULL);
Expand Down
Loading