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

Use to_unicode from stringutils avoid deprecation warning

Browse Source
This commit is contained in:
Bo Maryniuk 2018-06-02 20:35:46 +02:00 committed by rallytime
parent 73d33cbfc3
commit 9465e5f1e9
No known key found for this signature in database
GPG Key ID: E8F1A4B90D0DEA19
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/state.py
View File

@ -41,7 +41,6 @@ import salt.utils.url
import salt.utils.versions
from salt.exceptions import CommandExecutionError, SaltInvocationError
from salt.runners.state import orchestrate as _orchestrate
from salt.utils import to_unicode
# Import 3rd-party libs
from salt.ext import six
@ -1992,9 +1991,9 @@ def pkg(pkg_path,
# Verify that the tarball does not extract outside of the intended root
members = s_pkg.getmembers()
for member in members:
if to_unicode(member.path).startswith((os.sep, '..{0}'.format(os.sep))):
if salt.utils.stringutils.to_unicode(member.path).startswith((os.sep, '..{0}'.format(os.sep))):
return {}
elif '..{0}'.format(os.sep) in to_unicode(member.path):
elif '..{0}'.format(os.sep) in salt.utils.stringutils.to_unicode(member.path):
return {}
s_pkg.extractall(root)
s_pkg.close()