summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatherine Devlin <catherine.devlin@gmail.com>2013-06-15 01:00:17 -0400
committerCatherine Devlin <catherine.devlin@gmail.com>2013-06-15 01:00:17 -0400
commite6c2173fe6085d370ebfba3347841b729a96a078 (patch)
tree501eea7548bcb86e94a3976a5eeef2c51d57d234
parentf56abf5aab79e934896ee353070e7fa8fddaf619 (diff)
parent1c860cc7c0b27bf93f169ca81ae476a818903a6c (diff)
downloadcmd2-hg-e6c2173fe6085d370ebfba3347841b729a96a078.tar.gz
Merged in desaintmartin/cmd2/desaintmartin/fixed-which-calls-being-verbose-to-stder-1369996337663 (pull request #1)
Fixed "which" calls being verbose to stderr.
-rwxr-xr-xcmd2.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd2.py b/cmd2.py
index 993af89..0048a10 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -420,8 +420,8 @@ class Cmd(cmd.Cmd):
if sys.platform[:3] == 'win':
editor = 'notepad'
else:
- for editor in ['gedit', 'kate', 'vim', 'emacs', 'nano', 'pico']:
- if subprocess.Popen(['which', editor], stdout=subprocess.PIPE).communicate()[0]:
+ for editor in ['gedit', 'kate', 'vim', 'vi', 'emacs', 'nano', 'pico']:
+ if subprocess.Popen(['which', editor], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0]:
break
colorcodes = {'bold':{True:'\x1b[1m',False:'\x1b[22m'},