Fix for pep8 E722 and ignore E741

New flake8 release causes these to suddenly show up.

Change-Id: If7fa5a549a2e1651d0353defcc910374bdd226c2
12 files changed