tyler.durden
/
test262
mirror of https://github.com/tc39/test262.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: Update PyYAML version. (#2279) 

Fixes #2278.
This commit is contained in:
Ms2ger 2019-08-12 15:49:14 +02:00 committed by Leo Balter
parent 4d31d84531
commit c4e5d69044
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/generation/lib/template.py
View File

@ -154,20 +154,20 @@ class Template:
features += self.attribs['meta'].get('features', []) features += self.attribs['meta'].get('features', [])
features = list(OrderedDict.fromkeys(features)) features = list(OrderedDict.fromkeys(features))
if len(features): if len(features):
lines += ['features: ' + re.sub('\n\s*', ' ', yaml.dump(features).strip())] lines += ['features: ' + re.sub('\n\s*', ' ', yaml.dump(features, default_flow_style=True).strip())]
flags = ['generated'] flags = ['generated']
flags += case_values['meta'].get('flags', []) flags += case_values['meta'].get('flags', [])
flags += self.attribs['meta'].get('flags', []) flags += self.attribs['meta'].get('flags', [])
flags = list(OrderedDict.fromkeys(flags)) flags = list(OrderedDict.fromkeys(flags))
lines += ['flags: ' + re.sub('\n\s*', ' ', yaml.dump(flags).strip())] lines += ['flags: ' + re.sub('\n\s*', ' ', yaml.dump(flags, default_flow_style=True).strip())]
includes = [] includes = []
includes += case_values['meta'].get('includes', []) includes += case_values['meta'].get('includes', [])
includes += self.attribs['meta'].get('includes', []) includes += self.attribs['meta'].get('includes', [])
includes = list(OrderedDict.fromkeys(includes)) includes = list(OrderedDict.fromkeys(includes))
if len(includes): if len(includes):
lines += ['includes: ' + re.sub('\n\s*', ' ', yaml.dump(includes).strip())] lines += ['includes: ' + re.sub('\n\s*', ' ', yaml.dump(includes, default_flow_style=True).strip())]
if case_values['meta'].get('negative'): if case_values['meta'].get('negative'):
if self.attribs['meta'].get('negative'): if self.attribs['meta'].get('negative'):

2
tools/generation/requirements.txt
View File

@ -1 +1 @@
PyYAML==3.11 PyYAML==5.1.2

2
tools/lint/lib/checks/harnessfeatures.py
View File

@ -9,7 +9,7 @@ class CheckHarnessFeatures(Check):
def __init__(self): def __init__(self):
with open('./harness/features.yml', 'r') as f: with open('./harness/features.yml', 'r') as f:
self.include_has_features = yaml.load(f.read()) self.include_has_features = yaml.safe_load(f.read())
def comparison_result_lists(self, meta): def comparison_result_lists(self, meta):

2
tools/lint/lib/frontmatter.py
View File

@ -11,6 +11,6 @@ def parse(src):
return None return None
try: try:
return yaml.load(match.group(1)) return yaml.safe_load(match.group(1))
except (yaml.scanner.ScannerError, yaml.parser.ParserError): except (yaml.scanner.ScannerError, yaml.parser.ParserError):
return None return None

2
tools/lint/requirements.txt
View File

@ -1,2 +1,2 @@
PyYAML==3.11 PyYAML==5.1.2
inflect==0.2.5 inflect==0.2.5