Code review comment for lp:~rockstar/entertainer/trivial-fixes

approve merge_conditional

1) You linked to Bug 313841 XXX: pylint unused args, which is about removing W0613, but what you actually fixed was W0612. Great work cleaning up 612, but if you want to continue to link to Bug 313841, please do something about W0613 (whether that be to ignore it forever or enable it and clean up the problem areas).

2) You changed buffer_probe to _buffer_probe, but nothing seems to use _buffer_probe. Why was this done?

3) You enabled W0622 and cleaned everything up, but you left in the related XXX line in pylintrc.

After these things are addressed, I'm happy with this branch. It was actually pretty educational learning about all the builtins that we overrode that I didn't even know existed. Thanks!