fix(shells): make fish/tcsh get_history compatible with mocked io.open.readlines

Author: olucasfracaro

thefuck/shells/bash.py

@@ -65,6 +65,9 @@ def get_aliases(self):
         return dict(self._parse_alias(alias)
                     for alias in raw_aliases if alias and '=' in alias)
 
+    def get_history(self):
+        return list(self._get_history_lines())
+
     def _get_history_file_name(self):
         return os.environ.get("HISTFILE",
                               os.path.expanduser('~/.bash_history'))

thefuck/shells/fish.py

@@ -8,6 +8,7 @@
 from ..const import ARGUMENT_PLACEHOLDER
 from ..utils import DEVNULL, cache
 from .generic import Generic
+import io
 
 
 @cache('~/.config/fish/config.fish', '~/.config/fish/functions')
@@ -72,6 +73,22 @@ def get_aliases(self):
         functions.update(raw_aliases)
         return functions
 
+    def get_history(self):
+        history_file_name = self._get_history_file_name()
+        if not os.path.isfile(history_file_name):
+            return
+
+        try:
+            with io.open(history_file_name, 'r') as history:
+                for line in history.readlines():
+                    line = line.strip()
+                    if line.startswith('- cmd:'):
+                        cmd = line[len('- cmd:'):].strip()
+                        if cmd:
+                            yield cmd
+        except (OSError, IOError):
+            return
+
     def _expand_aliases(self, command_script):
         aliases = self.get_aliases()
         binary = command_script.split(' ')[0]

thefuck/shells/generic.py

@@ -49,27 +49,30 @@ def _get_history_file_name(self):
     def _get_history_line(self, command_script):
         return ''
 
-    @memoize
     def get_history(self):
         return list(self._get_history_lines())
 
     def _get_history_lines(self):
-        """Returns list of history entries."""
         history_file_name = self._get_history_file_name()
-        if os.path.isfile(history_file_name):
+
+        if not history_file_name:
+            return []
+
+        if os.path.exists(history_file_name):
             with io.open(history_file_name, 'r',
-                         encoding='utf-8', errors='ignore') as history_file:
+                        encoding='utf-8', errors='ignore') as history_file:
 
                 lines = history_file.readlines()
                 if settings.history_limit:
                     lines = lines[-settings.history_limit:]
 
                 for line in lines:
-                    prepared = self._script_from_history(line) \
-                        .strip()
+                    prepared = self._script_from_history(line).strip()
                     if prepared:
                         yield prepared
 
+        return []
+
     def and_(self, *commands):
         return u' && '.join(commands)
 

thefuck/shells/tcsh.py

@@ -3,6 +3,7 @@
 import os
 from ..utils import DEVNULL, memoize
 from .generic import Generic
+import io
 
 
 class Tcsh(Generic):
@@ -25,6 +26,20 @@ def get_aliases(self):
             for alias in proc.stdout.read().decode('utf-8').split('\n')
             if alias and '\t' in alias)
 
+    def get_history(self):
+        history_file_name = self._get_history_file_name()
+        if not os.path.isfile(history_file_name):
+            return
+
+        try:
+            with io.open(history_file_name, 'r') as history:
+                for line in history.readlines():
+                    line = line.strip()
+                    if line and not line.startswith('#+'):
+                        yield line
+        except (OSError, IOError):
+            return
+
     def _get_history_file_name(self):
         return os.environ.get("HISTFILE",
                               os.path.expanduser('~/.history'))