saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #39569 from s0undt3ch/2016.3

Browse source 
Don't use our own six dictionary fixes in this branch
This commit is contained in:
Mike Place 2017-02-22 11:59:48 -07:00 • committed by GitHub
commit 3fb928b63a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.pylintrc
View file

@ -52,7 +52,8 @@ fileperms-default=0644
fileperms-ignore-paths=tests/runtests.py,tests/jenkins*.py,tests/saltsh.py,tests/buildpackage.py
# Py3 Modernize PyLint Plugin Settings
modernize-nofix = libmodernize.fixes.fix_dict_six
modernize-nofix = libmodernize.fixes.fix_dict_six,
saltpylint.py3modernize.fixes.fix_dict_salt_six
# Minimum Python Version To Enforce
minimum-python-version = 2.6

3
.testing.pylintrc
View file

@ -49,7 +49,8 @@ fileperms-default=0644
fileperms-ignore-paths=tests/runtests.py,tests/jenkins*.py,tests/saltsh.py,tests/buildpackage.py
# Py3 Modernize PyLint Plugin Settings
modernize-nofix = libmodernize.fixes.fix_dict_six
modernize-nofix = libmodernize.fixes.fix_dict_six,
saltpylint.py3modernize.fixes.fix_dict_salt_six
# Minimum Python Version To Enforce
minimum-python-version = 2.6