x
/
gluon
Code Issues Proposed changes

Merge "Remove confusing else statement"

This commit is contained in:
Zuul 2017-11-22 19:10:53 +00:00 committed by Gerrit Code Review
parent 0bbfe4f360 a0bffe14c0
commit 8b721a0531
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gluon/particleGenerator/generator.py
View File

@ -309,10 +309,11 @@ def append_model(model, yaml_dict):
file_version = yaml_dict.get('file_version')
cur_file_version = model.get('file_version')
if file_version and cur_file_version:
if file_version != file_version:
if file_version != cur_file_version:
raise_format_error('File version mismatch %s', (file_version))
else:
model['file_version'] = yaml_dict['file_version']
# no need to re-assign! entering else statement implies they are equal
# else:
# model['file_version'] = yaml_dict['file_version']
elif file_version:
model['file_version'] = file_version
if 'imports' in yaml_dict: