Remove more python2 code

2 jobs from py2 in 26 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Test
passed #8817
run-test

00:00:18

 
  Build
passed #8818
run-build

00:00:07