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

Fix review nits

Browse source
This commit is contained in:
Daniel A. Wozniak 2018-08-26 17:03:16 -07:00 • committed by rallytime
parent 0e18b157e3
commit 6c92ed2021
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/support/helpers.py
View file

@ -1614,8 +1614,8 @@ def dedent(text, linesep=os.linesep):
linesep = salt.utils.to_unicode(linesep)
unicode_text = textwrap.dedent(salt.utils.to_unicode(text))
clean_text = linesep.join(unicode_text.splitlines())
if unicode_text.endswith(salt.utils.to_unicode('\n')):
clean_text = clean_text + linesep
if unicode_text.endswith(u'\n'):
clean_text += linesep
if not isinstance(text, six.text_type):
return salt.utils.to_bytes(clean_text)
return clean_text