Revert "some fixes suggestsed by pylint"
Revert "some fixes suggestsed by pylint"

This reverts commit ed8eaef84f34ce4e38e5773948540082a444bfe8.

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