Merge c32cdbd into 7f34427

tests/output_readers/test_rerun.py

@@ -30,6 +30,11 @@ def test_get_output_invalid_continuation_byte(self, popen_mock):
         actual = rerun.get_output('', '')
         assert actual == expected
 
+    def test_get_output_unicode_misspell(self, mocker):
+        wait_output_spier = mocker.spy(rerun, '_wait_output')
+        rerun.get_output(u'pácman', u'pácman')
+        wait_output_spier.assert_called_once()
+
     def test_wait_output_is_slow(self, settings):
         assert rerun._wait_output(Mock(), True)
         self.proc_mock.wait.assert_called_once_with(settings.wait_slow_command)

thefuck/output_readers/read_log.py

@@ -40,6 +40,9 @@ def _group_by_calls(log):
 
 
 def _get_script_group_lines(grouped, script):
+    if six.PY2:
+        script = script.encode('utf-8', errors='replace')
+
     parts = shlex.split(script)
 
     for script_line, lines in reversed(grouped):

thefuck/output_readers/rerun.py

@@ -1,5 +1,6 @@
 import os
 import shlex
+import six
 from subprocess import Popen, PIPE, STDOUT
 from psutil import AccessDenied, Process, TimeoutExpired
 from .. import logs
@@ -53,6 +54,9 @@ def get_output(script, expanded):
     env = dict(os.environ)
     env.update(settings.env)
 
+    if six.PY2:
+        expanded = expanded.encode('utf-8', errors='replace')
+
     split_expand = shlex.split(expanded)
     is_slow = split_expand[0] in settings.slow_commands if split_expand else False
     with logs.debug_time(u'Call: {}; with env: {}; is slow: {}'.format(