valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

markupsafe is not needed for older Jinja

Browse Source
This commit is contained in:
Thomas S Hatch 2013-07-23 14:44:06 -06:00
parent bd30ce1c4d
commit f577ed2837
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/utils/thin.py
View File

@ -8,8 +8,13 @@ import tarfile
# Import third party libs
import jinja2
import markupsafe
import yaml
try:
import markupsafe
HAS_MARKUPSAFE = True
except ImportError:
# Older jinja does not need markupsafe
HAS_MARKUPSAFE = False
# Import salt libs
import salt
@ -32,9 +37,10 @@ def gen_thin(cachedir):
tops = [
os.path.dirname(salt.__file__),
os.path.dirname(jinja2.__file__),
os.path.dirname(markupsafe.__file__),
os.path.dirname(yaml.__file__),
]
if HAS_MARKUPSAFE:
tops.append(os.path.dirname(markupsafe.__file__))
with tarfile.open(thintar, 'w:gz') as tfp:
start_dir = os.getcwd()
for top in tops: