diff options
author | Tom Rini <trini@konsulko.com> | 2019-11-05 07:59:28 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-11-05 07:59:28 -0500 |
commit | b62553736e0131b88befad128a2dd40c75e3293c (patch) | |
tree | 8164b210b7788aae0e86ce143e35240013b9d0c6 /tools/patman/func_test.py | |
parent | 73b6e6ad254b36763419cdd3fdf406c0094517b7 (diff) | |
parent | 388560134b99dc4cc752627d3a7e9f8c8c2a89a7 (diff) |
Merge tag 'fdt-pull-5nov19' of git://git.denx.de/u-boot-fdt
Update to latest libfdt and pylibfdt, with added size control
Update binman, dtoc, patman, buildman to Python 3
Update move_config, rkmux, microcode_tool to Python 3
Diffstat (limited to 'tools/patman/func_test.py')
-rw-r--r-- | tools/patman/func_test.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py index 2321f9e028b..76319fff37e 100644 --- a/tools/patman/func_test.py +++ b/tools/patman/func_test.py @@ -51,7 +51,7 @@ class TestFunctional(unittest.TestCase): @classmethod def GetText(self, fname): - return open(self.GetPath(fname)).read() + return open(self.GetPath(fname), encoding='utf-8').read() @classmethod def GetPatchName(self, subject): @@ -160,7 +160,7 @@ class TestFunctional(unittest.TestCase): dry_run, not ignore_bad_tags, cc_file, in_reply_to=in_reply_to, thread=None) series.ShowActions(args, cmd, process_tags) - cc_lines = open(cc_file).read().splitlines() + cc_lines = open(cc_file, encoding='utf-8').read().splitlines() os.remove(cc_file) lines = out[0].splitlines() @@ -229,14 +229,14 @@ Simon Glass (2): 2.7.4 ''' - lines = open(cover_fname).read().splitlines() + lines = open(cover_fname, encoding='utf-8').read().splitlines() self.assertEqual( 'Subject: [RFC PATCH v3 0/2] test: A test patch series', lines[3]) self.assertEqual(expected.splitlines(), lines[7:]) for i, fname in enumerate(args): - lines = open(fname).read().splitlines() + lines = open(fname, encoding='utf-8').read().splitlines() subject = [line for line in lines if line.startswith('Subject')] self.assertEqual('Subject: [RFC %d/%d]' % (i + 1, count), subject[0][:18]) |