diff options
| -rwxr-xr-x | cmd2.py | 29 |
1 files changed, 12 insertions, 17 deletions
@@ -62,6 +62,12 @@ from six.moves import zip # noinspection PyUnresolvedReferences from six.moves.urllib.request import urlopen +# Prefer statically linked gnureadline if available (for Mac OS X compatibility due to issues with libedit) +try: + import gnureadline +except ImportError: + import readline + # Python 3 compatibility hack due to no built-in file keyword in Python 3 # Due to one occurrence of isinstance(<foo>, file) checking to see if something is of file type try: @@ -1111,9 +1117,8 @@ class Cmd(cmd.Cmd): if not len(line): line = 'EOF' else: - if line[-1] == '\n': # this was always true in Cmd - line = line[:-1] - return line + line = line.rstrip('\r\n') + return line.strip() def _cmdloop(self): """Repeatedly issue a prompt, accept input, parse an initial prefix @@ -1127,14 +1132,9 @@ class Cmd(cmd.Cmd): # An almost perfect copy from Cmd; however, the pseudo_raw_input portion # has been split out so that it can be called separately if self.use_rawinput and self.completekey: - try: - # noinspection PyUnresolvedReferences - import readline - self.old_completer = readline.get_completer() - readline.set_completer(self.complete) - readline.parse_and_bind(self.completekey + ": complete") - except ImportError: - pass + self.old_completer = readline.get_completer() + readline.set_completer(self.complete) + readline.parse_and_bind(self.completekey + ": complete") stop = None try: while not stop: @@ -1148,12 +1148,7 @@ class Cmd(cmd.Cmd): stop = self.onecmd_plus_hooks(line) finally: if self.use_rawinput and self.completekey: - try: - # noinspection PyUnresolvedReferences - import readline - readline.set_completer(self.old_completer) - except ImportError: - pass + readline.set_completer(self.old_completer) return stop # noinspection PyUnusedLocal |