pyami module: tidy up to meet PEP8 better
Merge pull request #2460 from felixonmars/pyami-tidy

pyami module: tidy up to meet PEP8 better. Fixes #2460.