a3cab12393

Also fixes tests that were broken on PyPy. Co-Authored-By: Jim Rollenhagen <jim@jimrollenhagen.com> Change-Id: I2554aa844b040c4c74cbf287dccb06d816a39dbe
Description
Languages
Python
99.9%
Shell
0.1%