Merge lp:~jimbaker/pyjuju/juju-get-cli-use-yaml-null into lp:pyjuju

[Jim Baker]

juju get should use standard YAML for null value

The juju get command for retrieving config settings currently uses a custom value of -Not set- to imply None (Python)/nil (golang), instead of just using YAML's support for a null value. This bug means that it's not possible to distinguish a user setting of this string of -Not set-, which prevents roundtripping on that specific value.

[Jim Baker (jimbaker)]

Please take a look.

[Clint Byrum (clint-fewbar)]

LGTM. This is only doable for trunk, not backportable.

review: Approve

=== modified file 'juju/control/config_get.py'
--- juju/control/config_get.py	2012-06-22 19:08:23 +0000
+++ juju/control/config_get.py	2012-09-13 18:48:20 +0000
@@ -82,7 +82,7 @@
             if k in settings:
                 v['value'] = settings[k]
             else:
-                v['value'] = "-Not set-"
+                v['value'] = None
 
             if 'default' in v:
                 if v['default'] == settings[k]:

=== modified file 'juju/control/tests/test_config_get.py'
--- juju/control/tests/test_config_get.py	2012-05-04 22:43:40 +0000
+++ juju/control/tests/test_config_get.py	2012-09-13 18:48:20 +0000
@@ -68,7 +68,7 @@
                  'outlook': {
                      'description': 'No default outlook.',
                      'type': 'string',
-                     'value': '-Not set-'},
+                     'value': None},
                  'skill-level': {
                      'description': 'A number indicating skill.',
                      'value': 24,