Merge lp:~stub/charm-helpers/bug-1458546-fix-relation-set-py3 into lp:charm-helpers

[Stuart Bishop]

Fix hookenv.relation_set() under Python 3

(because everything you write with Python 2 is techdebt ;) )

[lp:~stub/charm-helpers/bug-1458546-fix-relation-set-py3]

380. By Stuart Bishop on 2015-05-25

Link to the bug

[Chris Glass (tribaal)]

The contents of this branch are added to main thought https://code.launchpad.net/~free.ekanayaka/charm-helpers/relation-set-file/+merge/260594

Closing this one since it is now redundant.

Unmerged revisions

380. By Stuart Bishop on 2015-05-25

Link to the bug

379. By Stuart Bishop on 2015-05-25

Fix subprocess call in hookenv.relation_set

=== modified file 'charmhelpers/core/hookenv.py'
--- charmhelpers/core/hookenv.py	2015-05-20 22:56:01 +0000
+++ charmhelpers/core/hookenv.py	2015-05-25 13:06:56 +0000
@@ -364,7 +364,7 @@
     relation_settings = relation_settings if relation_settings else {}
     relation_cmd_line = ['relation-set']
     accepts_file = "--file" in subprocess.check_output(
-        relation_cmd_line + ["--help"])
+        relation_cmd_line + ["--help"], universal_newlines=True)
     if relation_id is not None:
         relation_cmd_line.extend(('-r', relation_id))
     settings = relation_settings.copy()
 
=== modified file 'tests/core/test_hookenv.py'
--- tests/core/test_hookenv.py	2015-05-20 22:56:01 +0000
+++ tests/core/test_hookenv.py	2015-05-25 13:06:56 +0000
@@ -970,7 +970,8 @@
         # whether we can pass --file to it.
         check_output.return_value = "--file"
         hookenv.relation_set(foo="bar")
-        check_output.assert_called_with(["relation-set", "--help"])
+        check_output.assert_called_with(["relation-set", "--help"],
+                                        universal_newlines=True)
         # relation-set is called with relation-set --file <temp_file>
         # with data as YAML and the temp_file is then removed.
         self.assertEqual(1, len(check_call.call_args[0]))