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 py3 wart, encode os.linesep

Browse source
This commit is contained in:
Daniel A. Wozniak 2018-04-13 12:33:23 -07:00
parent d79f1a1961
commit 25fd7c0694
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/unit/fileserver/test_roots.py
View file

@ -62,7 +62,9 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix
with salt.utils.fopen(full_path_to_file, 'rb') as s_fp:
with salt.utils.fopen(os.path.join(cls.tmp_dir, 'testfile'), 'wb') as d_fp:
for line in s_fp:
d_fp.write(line.rstrip(b'\n').rstrip(b'\r') + os.linesep)
d_fp.write(
line.rstrip(b'\n').rstrip(b'\r') + os.linesep.encode('utf-8')
)
@classmethod
def tearDownClass(cls):