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 #38167 from cachedout/no_pkg_resources

Browse source 
Kill pkg_resources for CLI tools [DO NOT MERGE]
This commit is contained in:
Mike Place 2016-12-22 15:11:21 -07:00 • committed by GitHub
commit 4c4f07ca4c
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/cli/key.py
View file

@ -2,6 +2,7 @@
from __future__ import print_function
from __future__ import absolute_import
from salt.utils import parsers
from salt.utils.verify import check_user, verify_log

3
salt/cli/salt.py
View file

@ -2,8 +2,9 @@
# Import python libs
from __future__ import absolute_import, print_function
import os
import sys
sys.modules['pkg_resources'] = None
import os
# Import Salt libs
from salt.ext.six import string_types