utils: Simplify the unicodification of pager input

Duplicate what we're doing in pwclient.

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

Author: stephenfin

git_pw/utils.py

@@ -4,7 +4,6 @@
 
 from __future__ import print_function
 
-import codecs
 import csv
 import os
 import subprocess
@@ -81,44 +80,27 @@ def _tabulate(output, headers, fmt):
     sys.exit(1)
 
 
-def _is_ascii_encoding(encoding):
-    """Checks if a given encoding is ascii."""
-    try:
-        return codecs.lookup(encoding).name == 'ascii'
-    except LookupError:
-        return False
-
-
-def _get_best_encoding(stream):
-    """Returns the default stream encoding if not found."""
-    rv = getattr(stream, 'encoding', None) or sys.getdefaultencoding()
-    if _is_ascii_encoding(rv):
-        return 'utf-8'
-    return rv
-
-
 def _echo_via_pager(pager, output):
     env = dict(os.environ)
     # When the LESS environment variable is unset, Git sets it to FRX (if
     # LESS environment variable is set, Git does not change it at all).
     if 'LESS' not in env:
         env['LESS'] = 'FRX'
 
-    c = subprocess.Popen(pager, shell=True, stdin=subprocess.PIPE,
-                         env=env)
-    encoding = _get_best_encoding(c.stdin)
+    pager = subprocess.Popen(pager.split(), stdin=subprocess.PIPE, env=env)
+
+    output = six.ensure_binary(output)
 
     try:
-        for line in output:
-            c.stdin.write(line.encode(encoding, 'replace'))
+        pager.communicate(input=output)
     except (IOError, KeyboardInterrupt):
         pass
     else:
-        c.stdin.close()
+        pager.stdin.close()
 
     while True:
         try:
-            c.wait()
+            pager.wait()
         except KeyboardInterrupt:
             pass
         else:

releasenotes/notes/issue-49-865c4f1657b97fce.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    An issue with the unicode data when using the CSV format on Python 2.7 has
+    been resolved.