Merge pull request #95 from jayaddison/tools-dir-pyupgrade

Apply pyupgrade to the tools directory