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 #28832 from basepi/backport.28826

Browse source 
[2015.5] Backport #28826
This commit is contained in:
Colton Myers 2015-11-12 12:32:03 -07:00
commit eb904665dc
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
salt/utils/thin.py
View file

@ -24,6 +24,24 @@ try:
except ImportError:
HAS_CERTIFI = False
try:
import singledispatch
HAS_SINGLEDISPATCH = True
except ImportError:
HAS_SINGLEDISPATCH = False
try:
import singledispatch_helpers
HAS_SINGLEDISPATCH_HELPERS = True
except ImportError:
HAS_SINGLEDISPATCH_HELPERS = False
try:
import backports_abc
HAS_BACKPORTS_ABC = True
except ImportError:
HAS_BACKPORTS_ABC = False
try:
import markupsafe
HAS_MARKUPSAFE = True
@ -118,6 +136,15 @@ def gen_thin(cachedir, extra_mods='', overwrite=False, so_mods=''):
if HAS_CERTIFI:
tops.append(os.path.dirname(certifi.__file__))
if HAS_SINGLEDISPATCH:
tops.append(singledispatch.__file__.replace('.pyc', '.py'))
if HAS_SINGLEDISPATCH_HELPERS:
tops.append(singledispatch_helpers.__file__.replace('.pyc', '.py'))
if HAS_BACKPORTS_ABC:
tops.append(backports_abc.__file__.replace('.pyc', '.py'))
if HAS_SSL_MATCH_HOSTNAME:
tops.append(os.path.dirname(os.path.dirname(ssl_match_hostname.__file__)))