saltstack/salt — pull request #4880 by cvrebert (2013-05-07 00:55:42+00:00)
Title: deal w/ shadowing of built-ins; fix all pylint W0622 problems

* add pragma comments where shadowing unavoidable
* apply variable renaming refactoring elsewhere