summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatherine Devlin <catherine.devlin@gsa.gov>2017-05-29 21:07:51 -0500
committerCatherine Devlin <catherine.devlin@gsa.gov>2017-05-29 21:07:51 -0500
commitd86ea01b5ade92139021447f5fd135f392b45c9a (patch)
treed1bb0be0ff447b875da6ba871a2675c16d8bad11
parente01ff81d323068d6fd62ccdacc36b2474ee4e2d6 (diff)
parent8c9d7528256f82c64591c5b70e7e9dab5c3c1417 (diff)
downloadcmd2-git-d86ea01b5ade92139021447f5fd135f392b45c9a.tar.gz
Merge branch 'master' of https://github.com/python-cmd2/cmd2
-rwxr-xr-xcmd2.py4
-rwxr-xr-xsetup.py2
-rw-r--r--tests/test_cmd2.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd2.py b/cmd2.py
index d15e023c..ddf63e64 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -87,7 +87,7 @@ try:
except ImportError:
pass
-__version__ = '0.7.2'
+__version__ = '0.7.3a'
# Pyparsing enablePackrat() can greatly speed up parsing, but problems have been seen in Python 3 in the past
pyparsing.ParserElement.enablePackrat()
@@ -1502,7 +1502,7 @@ class Cmd(cmd.Cmd):
if len(possible_path) == 0 and not text:
return []
- if os.path.sep not in possible_path:
+ if os.path.sep not in possible_path and possible_path != '~':
# The text before the search text is not a directory path.
# It is OK to try shell command completion.
command_completions = self._shell_command_complete(text)
diff --git a/setup.py b/setup.py
index f77391aa..e5196a6e 100755
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ Setuptools setup file, used to install or test 'cmd2'
"""
from setuptools import setup
-VERSION = '0.7.2'
+VERSION = '0.7.3a'
DESCRIPTION = "Extra features for standard library's cmd module"
LONG_DESCRIPTION = """cmd2 is an enhancement to the standard library's cmd module for Python 2.7
diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index 42fb9a8c..ce47ef47 100644
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -22,7 +22,7 @@ from conftest import run_cmd, normalize, BASE_HELP, HELP_HISTORY, SHORTCUTS_TXT,
def test_ver():
- assert cmd2.__version__ == '0.7.2'
+ assert cmd2.__version__ == '0.7.3a'
def test_base_help(base_app):