cloud-init-dev team mailing list archive

[Scott Moser <ssmoser2+ubuntu@xxxxxxxxx>]

Update the commit message on the merge proposal tomake sure it is in sync
with the current code.

- I think the '_set_preferred_ntp_client' client is kind of wierd.
  could we get the same function with an attribute ?
  Then it would only be called if used.  Rather than being called on init.

- 'handle' in cc_ntp is longer than i'd like. the less that function
  does the easier things are to test.  but I wont insist on that.


Diff comments:

> diff --git a/cloudinit/util.py b/cloudinit/util.py
> index acdc0d8..1b62433 100644
> --- a/cloudinit/util.py
> +++ b/cloudinit/util.py
> @@ -157,6 +157,13 @@ def encode_text(text, encoding='utf-8'):
>      return text.encode(encoding)
>  
>  
> +def decode_text(text, encoding='utf-8'):

this doesnt feel right. it is so very close to 'decode_binary'
and in general feels like a step backwards.
We're trying very much to expect correct types rather than 
decoding/encoding whatever comes in.

> +    # Converts a binary type to string using given encoding
> +    if isinstance(text, six.binary_type):
> +        return text.decode(encoding)
> +    return text
> +
> +
>  def b64d(source):
>      # Base64 decode some data, accepting bytes or unicode/str, and returning
>      # str/unicode if the result is utf-8 compatible, otherwise returning bytes.


-- 
https://code.launchpad.net/~raharper/cloud-init/+git/cloud-init/+merge/339438
Your team cloud-init commiters is requested to review the proposed merge of ~raharper/cloud-init:feature/update-ntp-spec into cloud-init:master.