[SPARK-2627] keep up with the PEP 8 fixes