#313 Remove types.Script, use Command with None as stdout and stderr

thefuck/main.py

@@ -97,12 +97,12 @@ def get_command(settings, args):
             return types.Command(script, stdout, stderr)
         else:
             logs.debug(u'Execution timed out!', settings)
-            return types.Script(script)
+            return types.Command(script, None, None)
 
 
 def get_matched_rule(command, rules, settings):
     """Returns first matched rule for command."""
-    script_only = isinstance(command, types.Script)
+    script_only = command.stdout is None and command.stderr is None
 
     for rule in rules:
         if script_only and rule.requires_output:

thefuck/rules/dirty_unzip.py

@@ -1,6 +1,5 @@
 import os
 import zipfile
-from thefuck import logs
 
 
 def _is_bad_zip(file):

thefuck/types.py

@@ -2,7 +2,6 @@ from collections import namedtuple
 
 
 Command = namedtuple('Command', ('script', 'stdout', 'stderr'))
-Script = namedtuple('Script', ('script'))
 
 Rule = namedtuple('Rule', ('name', 'match', 'get_new_command',
                            'enabled_by_default', 'side_effect',