summaryrefslogtreecommitdiff
path: root/cmd2/cmd2.py
diff options
context:
space:
mode:
authorkotfu <kotfu@kotfu.net>2018-05-28 22:50:15 -0600
committerkotfu <kotfu@kotfu.net>2018-05-28 22:50:15 -0600
commit7313fa467e6cb06e1f187dcbff2f643d13b4a0b2 (patch)
tree9c872784d63ac8ccb09bb613e45bc9ec975eed40 /cmd2/cmd2.py
parent4e2749e8a41a8556a302a7d8f8316549c8558daa (diff)
parentf3676f23183451165185386a0ef5fc2ad910781e (diff)
downloadcmd2-git-7313fa467e6cb06e1f187dcbff2f643d13b4a0b2.tar.gz
Merge branch 'plugin_functions' of github.com:python-cmd2/cmd2 into plugin_functions
Diffstat (limited to 'cmd2/cmd2.py')
-rw-r--r--cmd2/cmd2.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py
index 9f2181d0..c117b05b 100644
--- a/cmd2/cmd2.py
+++ b/cmd2/cmd2.py
@@ -45,8 +45,7 @@ import pyperclip
from . import constants
from . import utils
-
-from cmd2.parsing import StatementParser, Statement
+from .parsing import StatementParser, Statement
# Set up readline
from .rl_utils import rl_type, RlType