Set the encoding to UTF-8 on all file I/O
Hopefully this will resolve issues with building the spec on systems where the default encoding is somthing other than UTF-8.
This commit is contained in:
parent
6b52e1df77
commit
4e90b32348
2 changed files with 19 additions and 20 deletions
|
@ -125,7 +125,7 @@ def resolve_references(path, schema):
|
|||
if '$ref' in schema:
|
||||
value = schema['$ref']
|
||||
path = os.path.join(os.path.dirname(path), value)
|
||||
with open(path) as f:
|
||||
with open(path, encoding="utf-8") as f:
|
||||
ref = yaml.load(f, OrderedLoader)
|
||||
result = resolve_references(path, ref)
|
||||
del schema['$ref']
|
||||
|
@ -664,11 +664,11 @@ class MatrixUnits(Units):
|
|||
continue
|
||||
filepath = os.path.join(path, filename)
|
||||
logger.info("Reading swagger API: %s" % filepath)
|
||||
with open(filepath, "r") as f:
|
||||
with open(filepath, "r", encoding="utf-8") as f:
|
||||
# strip .yaml
|
||||
group_name = filename[:-5].replace("-", "_")
|
||||
group_name = "%s_%s" % (group_name, suffix)
|
||||
api = yaml.load(f.read(), OrderedLoader)
|
||||
api = yaml.load(f, OrderedLoader)
|
||||
api = resolve_references(filepath, api)
|
||||
api["__meta"] = self._load_swagger_meta(
|
||||
api, group_name
|
||||
|
@ -698,11 +698,11 @@ class MatrixUnits(Units):
|
|||
continue
|
||||
filepath = os.path.join(path, filename)
|
||||
logger.info("Reading swagger definition: %s" % filepath)
|
||||
with open(filepath, "r") as f:
|
||||
with open(filepath, "r", encoding="utf-8") as f:
|
||||
# strip .yaml
|
||||
group_name = re.sub(r"[^a-zA-Z0-9_]", "_", filename[:-5])
|
||||
group_name = "%s_%s" % (prefix, group_name)
|
||||
definition = yaml.load(f.read(), OrderedLoader)
|
||||
definition = yaml.load(f, OrderedLoader)
|
||||
definition = resolve_references(filepath, definition)
|
||||
if 'type' not in definition:
|
||||
continue
|
||||
|
@ -741,7 +741,7 @@ class MatrixUnits(Units):
|
|||
event_type = filename[:-5] # strip the ".yaml"
|
||||
logger.info("Reading event schema: %s" % filepath)
|
||||
|
||||
with open(filepath) as f:
|
||||
with open(filepath, encoding="utf-8") as f:
|
||||
event_schema = yaml.load(f, OrderedLoader)
|
||||
|
||||
schema_info = process_data_type(
|
||||
|
@ -792,7 +792,7 @@ class MatrixUnits(Units):
|
|||
filepath = os.path.join(path, filename)
|
||||
logger.info("Reading event example: %s" % filepath)
|
||||
try:
|
||||
with open(filepath, "r") as f:
|
||||
with open(filepath, "r", encoding="utf-8") as f:
|
||||
example = json.load(f)
|
||||
examples[filename] = examples.get(filename, [])
|
||||
examples[filename].append(example)
|
||||
|
@ -830,7 +830,7 @@ class MatrixUnits(Units):
|
|||
def read_event_schema(self, filepath):
|
||||
logger.info("Reading %s" % filepath)
|
||||
|
||||
with open(filepath, "r") as f:
|
||||
with open(filepath, "r", encoding="utf-8") as f:
|
||||
json_schema = yaml.load(f, OrderedLoader)
|
||||
|
||||
schema = {
|
||||
|
@ -942,7 +942,7 @@ class MatrixUnits(Units):
|
|||
|
||||
title_part = None
|
||||
changelog_lines = []
|
||||
with open(path, "r") as f:
|
||||
with open(path, "r", encoding="utf-8") as f:
|
||||
lines = f.readlines()
|
||||
prev_line = None
|
||||
for line in (tc_lines + lines):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue