Merge lp:~gnuoy/charm-helpers/1595418 into lp:charm-helpers

[Liam Young]

[James Page (james-page)]

review: Approve

[Stuart Bishop (stub)]

I always prefer to add the universal_newlines=True argument to the subprocess calls, so they return proper strings. This seems preferable than faffing about with manual decoding and making the assumption that the system encoding is UTF-8. And fewer bytestrings infecting your tests.

=== modified file 'charmhelpers/core/hookenv.py'
--- charmhelpers/core/hookenv.py	2016-03-30 21:04:15 +0000
+++ charmhelpers/core/hookenv.py	2016-06-23 07:14:09 +0000
@@ -1006,4 +1006,4 @@
     :raise: NotImplementedError if run on Juju < 2.0
     '''
     cmd = ['network-get', '--primary-address', binding]
-    return subprocess.check_output(cmd).strip()
+    return subprocess.check_output(cmd).decode('UTF-8').strip()

=== modified file 'tests/core/test_hookenv.py'
--- tests/core/test_hookenv.py	2016-03-09 20:30:51 +0000
+++ tests/core/test_hookenv.py	2016-06-23 07:14:09 +0000
@@ -1621,9 +1621,10 @@
     @patch('subprocess.check_output')
     def test_network_get_primary(self, check_output):
         '''Ensure that network-get is called correctly and output is returned'''
-        check_output.return_value = '192.168.22.1'
+        check_output.return_value = b'192.168.22.1'
         ip = hookenv.network_get_primary_address('mybinding')
-        check_output.assert_called_with(['network-get', '--primary-address', 'mybinding'])
+        check_output.assert_called_with(
+            ['network-get', '--primary-address', 'mybinding'])
         self.assertEqual(ip, '192.168.22.1')
 
     @patch('subprocess.check_output')