ticket:5 pep8
Merge branch 't5_edit_data' into t8_tag