From fc54469234abffaefe85a6ac3e3e58fd2a869af1 Mon Sep 17 00:00:00 2001 From: Miroslav Los Date: Fri, 8 Nov 2019 14:05:39 +0100 Subject: Make yang2props used with python3 Besides print use, all indentation was normalized on spaces. The output is text, hence binary flag was dropped as well. Signed-off-by: Miroslav Los Issue-ID: CCSDK-1919 Change-Id: I5845f50c817454c91b6aec023b40fdbb6e3a9bcf --- .../model/scripts/python/yang2props.py | 41 ++++++++++------------ 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/daexim-offsite-backup/model/scripts/python/yang2props.py b/daexim-offsite-backup/model/scripts/python/yang2props.py index 559d31b8b..97ceaa760 100755 --- a/daexim-offsite-backup/model/scripts/python/yang2props.py +++ b/daexim-offsite-backup/model/scripts/python/yang2props.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 import re import sys @@ -18,40 +18,35 @@ val = "" li = [] if len(sys.argv) < 3: - print 'yang2props.py ' - sys.exit(2) + print('yang2props.py ') + sys.exit(2) with open(sys.argv[1], "r") as ins: for line in ins: # if we see a leaf save the name for later if "leaf " in line: - match = re.search(r'leaf (\S+)', line) - if match: - leaf = match.group(1) - + match = re.search(r'leaf (\S+)', line) + if match: + leaf = match.group(1) + # if we see enum convert the value to enum format and see if it changed # if the value is different write a property entry if "enum " in line: - match = re.search(r'enum "(\S+)";', line) - if match: + match = re.search(r'enum "(\S+)";', line) + if match: val = match.group(1) - enum = to_enum(val) + enum = to_enum(val) # see if converting to enum changed the string - if val != enum: + if val != enum: property = "yang."+leaf+"."+enum+"="+val - if property not in li: - li.append( property) - + if property not in li: + li.append( property) -# Open output file -fo = open(sys.argv[2], "wb") -fo.write("# yang conversion properties \n") -fo.write("# used to convert Enum back to the original yang value \n") -fo.write("\n".join(li)) -fo.write("\n") -# Close opend file -fo.close() +with open(sys.argv[2], "w") as fo: + fo.write("# yang conversion properties \n") + fo.write("# used to convert Enum back to the original yang value \n") + fo.write("\n".join(li)) + fo.write("\n") - -- cgit 1.2.3-korg