From 685946b1f1d9195c4916abf547d8aba008dd7207 Mon Sep 17 00:00:00 2001 From: Peter Scheibel Date: Wed, 23 Oct 2019 14:24:14 -0700 Subject: syaml.dump now allows representing all syaml_ objects (originally this was only available for syaml.dump_config) (#13403) --- lib/spack/spack/util/spack_yaml.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/util/spack_yaml.py b/lib/spack/spack/util/spack_yaml.py index c4910be8bd..264d5414de 100644 --- a/lib/spack/spack/util/spack_yaml.py +++ b/lib/spack/spack/util/spack_yaml.py @@ -183,13 +183,6 @@ class OrderedLineDumper(RoundTripDumper): 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 @@ class SafeDumper(RoundTripDumper): 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. -- cgit v1.2.3-70-g09d2