cloud-init-dev team mailing list archive

[Dan Watkins <daniel.watkins@xxxxxxxxxxxxx>]

Diff comments:

> diff --git a/cloudinit/util.py b/cloudinit/util.py
> index a8a232b..446b7b9 100644
> --- a/cloudinit/util.py
> +++ b/cloudinit/util.py
> @@ -1596,14 +1596,22 @@ def json_dumps(data):
>                        separators=(',', ': '), default=json_serialize_default)
>  
>  
> -def yaml_dumps(obj, explicit_start=True, explicit_end=True):
> +def yaml_dumps(obj, explicit_start=True, explicit_end=True, noalias=False):
>      """Return data in nicely formatted yaml."""
> -    return yaml.safe_dump(obj,
> -                          line_break="\n",
> -                          indent=4,
> -                          explicit_start=explicit_start,
> -                          explicit_end=explicit_end,
> -                          default_flow_style=False)
> +
> +    class CIDumper(yaml.dumper.SafeDumper):
> +        pass
> +    dumper = CIDumper

Assigning to dumper here isn't necessary, and suggests to me when reading further down that it's an instance of some sort of Dumper class when it, in fact, isn't.

> +    if noalias:
> +        dumper.ignore_aliases = lambda self, data: True
> +
> +    return yaml.dump(obj,
> +                     line_break="\n",
> +                     indent=4,
> +                     explicit_start=explicit_start,
> +                     explicit_end=explicit_end,
> +                     default_flow_style=False,
> +                     Dumper=dumper)
>  
>  
>  def ensure_dir(path, mode=None):


-- 
https://code.launchpad.net/~raharper/cloud-init/+git/cloud-init/+merge/362877
Your team cloud-init commiters is requested to review the proposed merge of ~raharper/cloud-init:fix/netplan-nameserver-alias into cloud-init:master.