scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-11-16 06:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wip] tools: python3

Browse Source 
Signed-off-by: Wataru Ishida <ishida@nel-america.com>
This commit is contained in:
Wataru Ishida
2020-02-18 01:43:13 -08:00
parent b04e65f58a
commit 224fe6a7cf
17 changed files with 120 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/onlyaml.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
############################################################
#
# Extended YAML Support
@@ -102,15 +102,15 @@ def loadf(fname, vard={}):
# First load: grab the variables dict
string = open(fname).read()
try:
data = yaml.load(string)
except Exception, e:
data = yaml.load(string, Loader=yaml.FullLoader)
except Exception as e:
raise OnlYamlError("%s\n(filename: %s)" % (e, fname))
if type(data) is dict:
_v = dflatten({}, data.get('variables', {}))
variables.update(_v)
for (k,v) in _v.iteritems():
for (k,v) in list(_v.items()):
k = interpolate(k, variables)
v = interpolate(v, variables)
variables[k] = v
@@ -125,10 +125,10 @@ def loadf(fname, vard={}):
string = interpolate(string, variables)
try:
data = yaml.load(string)
except OnlYamlError, e:
data = yaml.load(string, Loader=yaml.FullLoader)
except OnlYamlError as e:
raise e
except Exception, e:
except Exception as e:
raise OnlYamlError("Interpolation produced invalid results:\n%s\n" % string)
return data
@@ -138,10 +138,10 @@ if __name__ == '__main__':
import sys
try:
if len(sys.argv) == 2:
print yaml.dump(loadf(sys.argv[1]))
print((yaml.dump(loadf(sys.argv[1]))))
else:
sys.stderr.write("usage: %s <yamlfile>\n" % sys.argv[0])
except OnlYamlError, e:
except OnlYamlError as e:
sys.stderr.write("error: %s\n" % e.value)