Ninepep8fix

The result of merge_and_pep8.sh script run on nine branch (no manual fix needed,all test pass)