zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

syaml.dump now allows representing all syaml_ objects (originally this was only available for syaml.dump_config) (#13403)

Browse Source
This commit is contained in:
Peter Scheibel 2019-10-23 14:24:14 -07:00 committed by Todd Gamblin
parent b29eb4212e
commit 685946b1f1
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/spack/spack/util/spack_yaml.py
View File

@ -183,13 +183,6 @@ def represent_str(self, data):
return super(OrderedLineDumper, self).represent_str(data)
# Make our special objects look like normal YAML ones.
OrderedLineDumper.add_representer(syaml_dict, OrderedLineDumper.represent_dict)
OrderedLineDumper.add_representer(syaml_list, OrderedLineDumper.represent_list)
OrderedLineDumper.add_representer(syaml_str, OrderedLineDumper.represent_str)
OrderedLineDumper.add_representer(syaml_int, OrderedLineDumper.represent_int)
class SafeDumper(RoundTripDumper):
def ignore_aliases(self, _data):
@ -197,10 +190,12 @@ def ignore_aliases(self, _data):
return True
# Allow syaml_dict objects to be represented by ruamel.yaml.dump. With this,
# syaml_dict allows a user to provide an ordered dictionary to yaml.dump when
# the RoundTripDumper is used.
# Make our special objects look like normal YAML ones.
RoundTripDumper.add_representer(syaml_dict, RoundTripDumper.represent_dict)
RoundTripDumper.add_representer(syaml_list, RoundTripDumper.represent_list)
RoundTripDumper.add_representer(syaml_int, RoundTripDumper.represent_int)
RoundTripDumper.add_representer(syaml_str, RoundTripDumper.represent_str)
OrderedLineDumper.add_representer(syaml_str, OrderedLineDumper.represent_str)
#: Max integer helps avoid passing too large a value to cyaml.