Merge lp:~johnsca/charm-helpers/unitdata-cli into lp:charm-helpers

[Cory Johns]

Fixed unitdata subcommand not being registered due to the import masking the import of the proper package.

[Charles Butler (lazypower)]

This looks reasonable, but i'm not familiar with the issue this resolves... Was unitdata not being exposed via chlp?

[Cory Johns (johnsca)]

I should have been more clear. The unitdata subcommand wasn't getting registered for chlp because in charmhelpers/cli/commands.py it was doing "from . import unitdata" to import charmhelpers/cli/unitdata.py to register the command but this import made it so charmheleprs.cli already had a unitdata attribute so it just used that instead of doing the import.

[Charles Butler (lazypower)]

+1 Approved. Thanks for the patch cory! LGTM

review: Approve

=== modified file 'charmhelpers/cli/__init__.py'
--- charmhelpers/cli/__init__.py	2015-08-04 20:02:59 +0000
+++ charmhelpers/cli/__init__.py	2015-11-09 16:55:59 +0000
@@ -20,7 +20,7 @@
 
 from six.moves import zip
 
-from charmhelpers.core import unitdata
+import charmhelpers.core.unitdata
 
 
 class OutputFormatter(object):
@@ -163,8 +163,8 @@
         if getattr(arguments.func, '_cli_no_output', False):
             output = ''
         self.formatter.format_output(output, arguments.format)
-        if unitdata._KV:
-            unitdata._KV.flush()
+        if charmhelpers.core.unitdata._KV:
+            charmhelpers.core.unitdata._KV.flush()
 
 
 cmdline = CommandLine()