Fix tests

thefuck/corrector.py

@@ -13,11 +13,11 @@ def load_rule(rule):
         rule_module = load_source(name, str(rule))
         priority = getattr(rule_module, 'priority', DEFAULT_PRIORITY)
     return Rule(name, rule_module.match,
-                      rule_module.get_new_command,
-                      getattr(rule_module, 'enabled_by_default', True),
-                      getattr(rule_module, 'side_effect', None),
-                      settings.priority.get(name, priority),
-                      getattr(rule_module, 'requires_output', True))
+                rule_module.get_new_command,
+                getattr(rule_module, 'enabled_by_default', True),
+                getattr(rule_module, 'side_effect', None),
+                settings.priority.get(name, priority),
+                getattr(rule_module, 'requires_output', True))
 
 
 def get_loaded_rules(rules):

thefuck/rules/fix_file.py

@@ -1,6 +1,6 @@
 import re
 import os
-from thefuck.utils import memoize, wrap_settings
+from thefuck.utils import memoize, default_settings
 from thefuck import shells
 
 
@@ -57,7 +57,7 @@ def match(command, settings):
     return _search(command.stderr) or _search(command.stdout)
 
 
-@wrap_settings({'fixlinecmd': '{editor} {file} +{line}',
+@default_settings({'fixlinecmd': '{editor} {file} +{line}',
                 'fixcolcmd': None})
 def get_new_command(command, settings):
     m = _search(command.stderr) or _search(command.stdout)

thefuck/utils.py

@@ -60,18 +60,20 @@ def which(program):
     return None
 
 
-def wrap_settings(params):
+def default_settings(params):
     """Adds default values to settings if it not presented.
 
     Usage:
 
-        @wrap_settings({'apt': '/usr/bin/apt'})
+        @default_settings({'apt': '/usr/bin/apt'})
         def match(command, settings):
             print(settings.apt)
 
     """
     def _wrap_settings(fn, command, settings):
-        return fn(command, Settings(settings, **params))
+        for k, w in params.items():
+            settings.setdefault(k, w)
+        return fn(command, settings)
     return decorator(_wrap_settings)