Merge pull request #38167 from cachedout/no_pkg_resources

Kill pkg_resources for CLI tools [DO NOT MERGE]
saltstack · Dec 22, 2016 · 4c4f07c · 4c4f07c
2 parents 2fc8c15 + ec69017
commit 4c4f07c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/salt/cli/key.py b/salt/cli/key.py
@@ -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
 

diff --git a/salt/cli/salt.py b/salt/cli/salt.py
@@ -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