command.script now unicode

tests/test_main.py

@@ -53,8 +53,8 @@ def test_get_command():
                   return_value=True):
         Popen.return_value.stdout.read.return_value = b'stdout'
         Popen.return_value.stderr.read.return_value = b'stderr'
-        assert main.get_command(Mock(), ['thefuck', 'apt-get',
+        assert main.get_command(Mock(), [b'thefuck', b'apt-get',
-                                         'search', 'vim']) \
+                                         b'search', b'vim']) \
                == main.Command('apt-get search vim', 'stdout', 'stderr')
         Popen.assert_called_once_with('apt-get search vim',
                                       shell=True,

thefuck/main.py

@@ -76,7 +76,7 @@ def wait_output(settings, popen):
 
 def get_command(settings, args):
     """Creates command from `args` and executes it."""
-    script = ' '.join(args[1:])
+    script = ' '.join(arg.decode('utf-8') for arg in args[1:])
     result = Popen(script, shell=True, stdout=PIPE, stderr=PIPE,
                    env=dict(os.environ, LANG='C'))
     if wait_output(settings, result):

thefuck/rules/has_exists_script.py

@@ -7,5 +7,5 @@ def match(command, settings):
 
 
 def get_new_command(command, settings):
-    return './{}'.format(command.script)
+    return u'./{}'.format(command.script)
 

thefuck/rules/no_command.py

@@ -8,7 +8,7 @@ local_settings = {'command_not_found': '/usr/lib/command-not-found'}
 
 def _get_output(command, settings):
     name = command.script.split(' ')[command.script.startswith('sudo')]
-    check_script = '{} {}'.format(settings.command_not_found, name)
+    check_script = u'{} {}'.format(settings.command_not_found, name)
     result = Popen(check_script, shell=True, stderr=PIPE)
     return result.stderr.read().decode('utf-8')
 

thefuck/rules/python_command.py

@@ -3,11 +3,12 @@
 #  2) is interpreted as shell script
 
 def match(command, settings):
-  toks = command.script.split()
+    toks = command.script.split()
-  return (len(toks) > 0
+    return (len(toks) > 0
-          and toks[0].endswith('.py')
+            and toks[0].endswith('.py')
-          and ('Permission denied' in command.stderr or
+            and ('Permission denied' in command.stderr or
-               'command not found' in command.stderr))
+                 'command not found' in command.stderr))
+
 
 def get_new_command(command, settings):
-  return 'python ' + command.script
+    return 'python ' + command.script

thefuck/rules/sudo.py

@@ -14,4 +14,4 @@ def match(command, settings):
 
 
 def get_new_command(command, settings):
-    return 'sudo {}'.format(command.script)
+    return u'sudo {}'.format(command.script)