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/settings.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/settings.py')
| -rw-r--r-- | tools/patman/settings.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/patman/settings.py b/tools/patman/settings.py index c98911d522b..5dc83a85002 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -165,7 +165,7 @@ def ReadGitAliases(fname): fname: Filename to read """ try: - fd = open(fname, 'r') + fd = open(fname, 'r', encoding='utf-8') except IOError: print("Warning: Cannot find alias file '%s'" % fname) return @@ -259,7 +259,7 @@ def _ReadAliasFile(fname): """ if os.path.exists(fname): bad_line = None - with open(fname) as fd: + with open(fname, encoding='utf-8') as fd: linenum = 0 for line in fd: linenum += 1 |