Merge pull request #877 from ghostduck/master

Specify encoding to UTF-8 when opening source file
This commit is contained in:
Steven Black 2019-01-05 23:02:40 -05:00 committed by GitHub
commit 3a84cf33f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -527,7 +527,7 @@ def update_sources_data(sources_data, **sources_params):
source_data_filename = sources_params["sourcedatafilename"]
for source in recursive_glob(sources_params["datapath"], source_data_filename):
update_file = open(source, "r")
update_file = open(source, "r", encoding="UTF-8")
update_data = json.load(update_file)
sources_data.append(update_data)
update_file.close()
@ -586,7 +586,7 @@ def update_all_sources(source_data_filename, host_filename):
all_sources = recursive_glob("*", source_data_filename)
for source in all_sources:
update_file = open(source, "r")
update_file = open(source, "r", encoding="UTF-8")
update_data = json.load(update_file)
update_file.close()
update_url = update_data["url"]
@ -631,7 +631,7 @@ def create_initial_file():
start = "# Start {}\n\n".format(os.path.basename(os.path.dirname(source)))
end = "# End {}\n\n".format(os.path.basename(os.path.dirname(source)))
with open(source, "r") as curFile:
with open(source, "r", encoding="UTF-8") as curFile:
write_data(merge_file, start + curFile.read() + end)
# spin the sources for extensions to the base file