Since it was my pylint work that wiped out charclo's fixes (not sure how that happened, I guess one of us didn't merge from the other, who knows), I'll replicate charclo's work from a new branch to fix the problem.
Since it was my pylint work that wiped out charclo's fixes (not sure how that happened, I guess one of us didn't merge from the other, who knows), I'll replicate charclo's work from a new branch to fix the problem.