Merge: Fix pypy errors

Signed-off-by: Michael Hofmann <mhofmann@redhat.com>

See merge request !357
2 jobs for main in 3 minutes and 24 seconds