summaryrefslogtreecommitdiff
path: root/cmd2.py
diff options
context:
space:
mode:
authorTodd Leonhardt <todd.leonhardt@gmail.com>2018-04-15 16:14:09 -0700
committerTodd Leonhardt <todd.leonhardt@gmail.com>2018-04-15 16:14:09 -0700
commit480c7f8bbcdf1179312f71f525e79102aa4551ae (patch)
tree1206a00a4e8d8a521dc00970c25da9973c5ac4f7 /cmd2.py
parent6b23d7e610b8f8634ad4535d5fbfdb5bfd944b5a (diff)
downloadcmd2-git-480c7f8bbcdf1179312f71f525e79102aa4551ae.tar.gz
Finished removing all dependencies on the six module
Diffstat (limited to 'cmd2.py')
-rwxr-xr-xcmd2.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/cmd2.py b/cmd2.py
index b1021a28..6ac1fee2 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -53,7 +53,6 @@ except ImportError:
import pyparsing
import pyperclip
from pyperclip import PyperclipException
-import six.moves as sm # Used for sm.input
# Collection is a container that is sizable and iterable
# It was introduced in Python 3.6. We will try to import it, otherwise use our implementation
@@ -2402,9 +2401,9 @@ class Cmd(cmd.Cmd):
if self.use_rawinput:
try:
if sys.stdin.isatty():
- line = sm.input(safe_prompt)
+ line = input(safe_prompt)
else:
- line = sm.input()
+ line = input()
if self.echo:
sys.stdout.write('{}{}\n'.format(safe_prompt, line))
except EOFError:
@@ -2798,7 +2797,7 @@ Usage: Usage: unalias [-a] name [name ...]
for (idx, (value, text)) in enumerate(fulloptions):
self.poutput(' %2d. %s\n' % (idx + 1, text))
while True:
- response = sm.input(prompt)
+ response = input(prompt)
hlen = readline.get_current_history_length()
if hlen >= 1 and response != '':
readline.remove_history_item(hlen - 1)