Revert "more cleaning thanks to pylint"
Revert "more cleaning thanks to pylint"

This reverts commit 97e893bef259983b6df9080c8c8894229b2cc9b5.

pombredanne/dedupe,tfmorris/dedupe,dedupeio/dedupe,tfmorris/dedupe,davidkunio/dedupe,dedupeio/dedupe,datamade/dedupe,nmiranda/dedupe,01-/dedupe,01-/dedupe,davidkunio/dedupe,datamade/dedupe,neozhangthe1/dedupe,pombredanne/dedupe,neozhangthe1/dedupe,nmiranda/dedupe