mirror of https://github.com/acidanthera/audk.git
.pytool/EccCheck: Open files in utf-8
The EccCheck plugin currently fails if a file contains characters outside the platform-dependent encoding returned from locale.getencoding(). This change updates the encoding to utf-8 so the plugin is more robust while continuing to support backward compatibility with the ASCII range. Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
This commit is contained in:
parent
260d36484d
commit
7e7492fa12
|
@ -144,7 +144,7 @@ class EccCheck(ICiBuildPlugin):
|
|||
#
|
||||
params = "diff --output={} --unified=0 origin/master HEAD".format(temp_diff_output)
|
||||
RunCmd("git", params)
|
||||
with open(temp_diff_output) as file:
|
||||
with open(temp_diff_output, encoding='utf8') as file:
|
||||
patch = file.read().strip().split('\n')
|
||||
return patch
|
||||
|
||||
|
@ -163,7 +163,7 @@ class EccCheck(ICiBuildPlugin):
|
|||
params = "diff --output={} --diff-filter=dr --name-status origin/master HEAD".format(temp_diff_output)
|
||||
RunCmd("git", params)
|
||||
dir_list = []
|
||||
with open(temp_diff_output) as file:
|
||||
with open(temp_diff_output, encoding='utf8') as file:
|
||||
dir_list = file.read().strip().split('\n')
|
||||
|
||||
modify_dir_list = []
|
||||
|
@ -271,7 +271,7 @@ class EccCheck(ICiBuildPlugin):
|
|||
modify_file_path = os.path.join(temp_path, modify_file)
|
||||
if not os.path.exists (modify_file_path):
|
||||
return comment_range
|
||||
with open(modify_file_path) as f:
|
||||
with open(modify_file_path, encoding='utf8') as f:
|
||||
line_no = 1
|
||||
Start = False
|
||||
for line in f:
|
||||
|
@ -319,7 +319,7 @@ class EccCheck(ICiBuildPlugin):
|
|||
row_lines = []
|
||||
ignore_error_code = self.GetIgnoreErrorCode()
|
||||
if os.path.exists(ecc_csv):
|
||||
with open(ecc_csv) as csv_file:
|
||||
with open(ecc_csv, encoding='utf8') as csv_file:
|
||||
reader = csv.reader(csv_file)
|
||||
for row in reader:
|
||||
for modify_file in ecc_diff_range:
|
||||
|
|
Loading…
Reference in New Issue