Merge branch 'master' into ignore_identchars

Author: kotfu

cmd2/cmd2.py

@@ -27,6 +27,7 @@
 import cmd
 import codecs
 import collections
+from colorama import Fore
 import copy
 import datetime
 import functools
@@ -52,7 +53,14 @@
 from . import utils
 
 # Set up readline
-from .rl_utils import rl_force_redisplay, readline, rl_type, RlType
+from .rl_utils import rl_type, RlType
+if rl_type == RlType.NONE:
+    rl_err_msg = "Tab completion has been disabled since no supported version of readline was found\n"
+    rl_err_msg += "To resolve this, install pyreadline on Windows or gnureadline on Mac\n"
+    sys.stderr.write(Fore.LIGHTYELLOW_EX + rl_err_msg + Fore.RESET)
+else:
+    from .rl_utils import rl_force_redisplay, readline
+
 from .argparse_completer import AutoCompleter, ACArgumentParser
 
 from cmd2.parsing import StatementParser, Statement
@@ -321,6 +329,9 @@ class EmptyStatement(Exception):
 def _pop_readline_history(clear_history: bool=True) -> List[str]:
     """Returns a copy of readline's history and optionally clears it (default)"""
     # noinspection PyArgumentList
+    if rl_type == RlType.NONE:
+        return []
+
     history = [
         readline.get_history_item(i)
         for i in range(1, 1 + readline.get_current_history_length())
@@ -332,10 +343,11 @@ def _pop_readline_history(clear_history: bool=True) -> List[str]:
 
 def _push_readline_history(history, clear_history=True):
     """Restores readline's history and optionally clears it first (default)"""
-    if clear_history:
-        readline.clear_history()
-    for line in history:
-        readline.add_history(line)
+    if rl_type != RlType.NONE:
+        if clear_history:
+            readline.clear_history()
+        for line in history:
+            readline.add_history(line)
 
 
 def _complete_from_cmd(cmd_obj, text, line, begidx, endidx):
@@ -469,7 +481,7 @@ def enter_submenu(parent_cmd, statement):
             original_attributes = self._get_original_attributes()
             history = _pop_readline_history()
 
-            if self.persistent_history_file:
+            if self.persistent_history_file and rl_type != RlType.NONE:
                 try:
                     readline.read_history_file(self.persistent_history_file)
                 except FileNotFoundError:
@@ -499,7 +511,7 @@ def enter_submenu(parent_cmd, statement):
                 self._copy_out_shared_attrs(parent_cmd, original_attributes)
 
                 # write submenu history
-                if self.persistent_history_file:
+                if self.persistent_history_file and rl_type != RlType.NONE:
                     readline.write_history_file(self.persistent_history_file)
                 # reset main app history before exit
                 _push_readline_history(history)
@@ -654,7 +666,7 @@ def __init__(self, completekey='tab', stdin=None, stdout=None, persistent_histor
                 pass
 
         # If persistent readline history is enabled, then read history from file and register to write to file at exit
-        if persistent_history_file:
+        if persistent_history_file and rl_type != RlType.NONE:
             persistent_history_file = os.path.expanduser(persistent_history_file)
             try:
                 readline.read_history_file(persistent_history_file)
@@ -1544,7 +1556,7 @@ def complete(self, text, state):
         :param text: str - the current word that user is typing
         :param state: int - non-negative integer
         """
-        if state == 0:
+        if state == 0 and rl_type != RlType.NONE:
             unclosed_quote = ''
             self.set_completion_defaults()
 
@@ -2617,9 +2629,12 @@ def select(self, opts, prompt='Your choice? '):
             self.poutput('  %2d. %s\n' % (idx + 1, text))
         while True:
             response = input(prompt)
-            hlen = readline.get_current_history_length()
-            if hlen >= 1 and response != '':
-                readline.remove_history_item(hlen - 1)
+
+            if rl_type != RlType.NONE:
+                hlen = readline.get_current_history_length()
+                if hlen >= 1 and response != '':
+                    readline.remove_history_item(hlen - 1)
+
             try:
                 response = int(response)
                 result = fulloptions[response - 1][0]

cmd2/rl_utils.py

@@ -34,11 +34,13 @@ class RlType(Enum):
     rl_type = RlType.PYREADLINE
 
 elif 'gnureadline' in sys.modules or 'readline' in sys.modules:
-    rl_type = RlType.GNU
+    # We don't support libedit
+    if 'libedit' not in readline.__doc__:
+        rl_type = RlType.GNU
 
-    # Load the readline lib so we can access members of it
-    import ctypes
-    readline_lib = ctypes.CDLL(readline.__file__)
+        # Load the readline lib so we can access members of it
+        import ctypes
+        readline_lib = ctypes.CDLL(readline.__file__)
 
 
 def rl_force_redisplay() -> None: