aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2014-06-30 18:38:23 +0100
committerBryn M. Reeves <bmr@redhat.com>2014-06-30 18:38:23 +0100
commited58d3ac7e69c46668211e883d961cb5a262dc86 (patch)
tree77c75f48294111d2cad5097fd8c0aea850882551 /Makefile
parente1661f4722d54f9ba7eda006055492201cdc196c (diff)
downloadsos-ed58d3ac7e69c46668211e883d961cb5a262dc86.tar.gz
[plugin] fix unicode vs. byte array handling in string IO
Causes a nosetests failure on python3: ====================================================================== ERROR: test_glob_file_over_limit (plugin_tests.AddCopySpecTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/breeves/src/git/sos/tests/plugin_tests.py", line 269, in test_glob_file_over_limit self.mp.add_copy_spec_limit("/tmp/tmp*", 1) File "/home/breeves/src/git/sos/sos/plugins/__init__.py", line 414, in add_copy_spec_limit self.add_string_as_file(tail(_file, sizelimit), strfile) File "/home/breeves/src/git/sos/sos/plugins/__init__.py", line 520, in add_string_as_file content = "..." + content.splitlines()[0] TypeError: Can't convert 'bytes' object to str implicitly ====================================================================== ERROR: test_single_file_over_limit (plugin_tests.AddCopySpecTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/breeves/src/git/sos/tests/plugin_tests.py", line 253, in test_single_file_over_limit self.mp.add_copy_spec_limit(fn, 1) File "/home/breeves/src/git/sos/sos/plugins/__init__.py", line 414, in add_copy_spec_limit self.add_string_as_file(tail(_file, sizelimit), strfile) File "/home/breeves/src/git/sos/sos/plugins/__init__.py", line 520, in add_string_as_file content = "..." + content.splitlines()[0] TypeError: Can't convert 'bytes' object to str implicitly ---------------------------------------------------------------------- Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions