pep8

also renaming patchset-> patch_set may affect some jenkins jobs (which are not in backup) I guess it's better to follow pep8 rule (screening symbal from outer scope)