Handle bytestring decode in 'git_config' helper

Don't split this over two places, lest we forget to do it.

Signed-off-by: Stephen Finucane <[email protected]>

Author: stephenfin

git_pw/config.py

@@ -30,7 +30,6 @@ def __getattribute__(self, name):
         value = utils.git_config('pw.{}'.format(name))
         if value:
             LOG.debug("Retrieved '{}' setting from git-config".format(name))
-            value = value.decode('utf-8')
 
         setattr(self, name, value)
 

git_pw/utils.py

@@ -7,6 +7,11 @@
 import subprocess
 import sys
 
+if sys.version_info < (3, 0):
+    _text = unicode  # noqa
+else:
+    _text = str  # noqa
+
 
 def trim(string, length=70):  # type: (str, int) -> str
     """Trim a string to the given length."""
@@ -22,9 +27,9 @@ def git_config(value):
     try:
         output = subprocess.check_output(['git', 'config', value])
     except subprocess.CalledProcessError:
-        output = ''
+        output = b''
 
-    return output.strip()
+    return output.decode('utf-8').strip()
 
 
 def git_am(mbox, args):

tests/test_utils.py

@@ -8,14 +8,23 @@
 from git_pw import utils
 
 
-@mock.patch.object(utils.subprocess, 'check_output', return_value=' bar ')
+@mock.patch.object(utils.subprocess, 'check_output', return_value=b' bar ')
 def test_git_config(mock_subprocess):
     value = utils.git_config('foo')
 
     assert value == 'bar'
     mock_subprocess.assert_called_once_with(['git', 'config', 'foo'])
 
 
+@mock.patch.object(utils.subprocess, 'check_output',
+                   return_value=b'\xf0\x9f\xa4\xb7')
+def test_git_config_unicode(mock_subprocess):
+    value = utils.git_config('foo')
+
+    assert value == u'\U0001f937'
+    mock_subprocess.assert_called_once_with(['git', 'config', 'foo'])
+
+
 @mock.patch.object(utils.subprocess, 'check_output',
                    side_effect=subprocess.CalledProcessError(1, 'xyz', '123'))
 def test_git_config_error(mock_subprocess):