zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-04-30 12:07:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make config/presubmits.py use explicit encodings (#908)

Browse source 
For some reason, our docker build image has started using a non-utf8 default
encoding.  Specify the encoding explicitly on python "open()" to override.

Note that this might not entirely fix the build: it's possible that this
problem may affect other portions of the build.
This commit is contained in:
Michael Muller 2020-12-16 10:03:32 -05:00 • committed by GitHub
parent 808b6a2a11
commit f782b91dc4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/presubmits.py
View file

@ -65,7 +65,7 @@ class PresubmitCheck:
for pattern in self.skipped_patterns: for pattern in self.skipped_patterns:
if pattern in file: if pattern in file:
return False return False
with open(file, "r") as f: with open(file, "r", encoding='utf8') as f:
file_content = f.read() file_content = f.read()
matches = re.match(self.regex, file_content, re.DOTALL) matches = re.match(self.regex, file_content, re.DOTALL)
if self.regex_type == FORBIDDEN: if self.regex_type == FORBIDDEN:
@ -241,7 +241,7 @@ def verify_flyway_index():
# Remove the sequence numbers and compare against the index file contents. # Remove the sequence numbers and compare against the index file contents.
files = [filename[1] for filename in sorted(files)] files = [filename[1] for filename in sorted(files)]
with open('db/src/main/resources/sql/flyway.txt') as index: with open('db/src/main/resources/sql/flyway.txt', encoding='utf8') as index:
indexed_files = index.read().splitlines() indexed_files = index.read().splitlines()
if files != indexed_files: if files != indexed_files:
unindexed = set(files) - set(indexed_files) unindexed = set(files) - set(indexed_files)