Fix pep8 errors according to pep8 1.5.6

After updating pep8 to 1.5.6 multiple errors were identified.
Fix them.

Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com>