Kill pkg_resources for CLI tools [DO NOT MERGE]

salt/cli/call.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 from __future__ import absolute_import
+import sys
+sys.modules['pkg_resources'] = None
 import os
 
 from salt.utils import parsers

salt/cli/cp.py

@@ -9,6 +9,8 @@
 # Import python libs
 from __future__ import print_function
 from __future__ import absolute_import
+import sys
+sys.modules['pkg_resources'] = None
 import os
 import sys
 

salt/cli/key.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 from __future__ import absolute_import
+import sys
+sys.modules['pkg_resources'] = None
+
 
 from salt.utils import parsers
 from salt.utils.verify import check_user, verify_log

salt/cli/run.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 from __future__ import absolute_import
+import sys
+sys.modules['pkg_resources'] = None
 
 from salt.utils import parsers
 from salt.utils import activate_profile

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

salt/cli/spm.py

@@ -10,6 +10,8 @@
 
 # Import Python libs
 from __future__ import absolute_import
+import sys
+sys.modules['pkg_resources'] = None
 
 # Import Salt libs
 import salt.spm