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

lint fixes

Browse source
This commit is contained in:
Damon Atkins 2017-08-19 11:39:41 +10:00
parent 8c864f02c7
commit ee41171c9f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/utils/__init__.py
View file

@ -177,8 +177,9 @@ def safe_filename_leaf(file_basename):
return urllib.quote(re_obj.group(0), safe=u'')
if not isinstance(file_basename, six.text_type):
# the following string is not prefixed with u
return re.sub('[\\\/:*?"<>|]',
_replace,six.text_type(file_basename, 'utf8').encode('ascii', 'backslashreplace'))
return re.sub('[\\\/:*?"<>|]',
_replace,
six.text_type(file_basename, 'utf8').encode('ascii', 'backslashreplace'))
# the following string is prefixed with u
return re.sub(u'[\\\/:*?"<>|]', _replace, file_basename, flags=re.UNICODE)
@ -188,7 +189,7 @@ def safe_filepath(file_path_name):
input the full path and filename, splits on directory separator and calls safe_filename_leaf for
each part of the path.
'''
(drive,path) = os.path.splitdrive(file_path_name)
(drive, path) = os.path.splitdrive(file_path_name)
path = os.sep.join([safe_filename_leaf(file_section) for file_section in file_path_name.rsplit(os.sep)])
if drive:
return os.sep.join([drive, path])