history limit from settings

thefuck/conf.py

@@ -16,6 +16,7 @@ DEFAULT_SETTINGS = {'rules': DEFAULT_RULES,
                     'no_colors': False,
                     'debug': False,
                     'priority': {},
+                    'history_limit': None,
                     'env': {'LC_ALL': 'C', 'LANG': 'C', 'GIT_TRACE': '1'}}
 
 ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
@@ -126,4 +127,3 @@ class Settings(dict):
 
 
 settings = Settings(DEFAULT_SETTINGS)
-settings.init()

thefuck/shells.py

@@ -60,10 +60,10 @@ class Generic(object):
 
     def get_history(self):
         """Returns list of history entries."""
-        tail_num = settings.get("history_limit", None)
+        tail_num = settings.history_limit
         history_file_name = self._get_history_file_name()
         if os.path.isfile(history_file_name):
-            if tail_num is not None:
+            if tail_num is not None and tail_num.isdigit():
                 _, f = os.popen2("tail -n {} {}".format(tail_num, history_file_name))
                 _.close()
             else: