diff options
| author | Kevin Van Brunt <kmvanbrunt@gmail.com> | 2018-03-16 16:54:15 -0400 |
|---|---|---|
| committer | Kevin Van Brunt <kmvanbrunt@gmail.com> | 2018-03-16 16:54:15 -0400 |
| commit | 408f673548d8c88dfc5ebec9dece154a2b71e57e (patch) | |
| tree | 2366ea5a745ce0812600047ee084e8b53ec8f6ec | |
| parent | aef4db11440c7146371d68ac73f364bddd28ecb6 (diff) | |
| parent | 3b7301baf078c9e0e6368492e148c5d63cf2abae (diff) | |
| download | cmd2-git-408f673548d8c88dfc5ebec9dece154a2b71e57e.tar.gz | |
Merge branch 'alias' of github.com:python-cmd2/cmd2 into alias
| -rw-r--r-- | .pytest_cache/v/cache/lastfailed | 1 | ||||
| -rw-r--r-- | tests/test_parsing.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.pytest_cache/v/cache/lastfailed b/.pytest_cache/v/cache/lastfailed deleted file mode 100644 index 9e26dfee..00000000 --- a/.pytest_cache/v/cache/lastfailed +++ /dev/null @@ -1 +0,0 @@ -{}
\ No newline at end of file diff --git a/tests/test_parsing.py b/tests/test_parsing.py index d9563716..12b50eda 100644 --- a/tests/test_parsing.py +++ b/tests/test_parsing.py @@ -43,7 +43,7 @@ def cs_pm(): commentGrammars=c.commentGrammars, commentInProgress=c.commentInProgress, blankLinesAllowed=c.blankLinesAllowed, prefixParser=c.prefixParser, preparse=c.preparse, postparse=c.postparse, aliases=c.aliases, - c.shortcuts) + shortcuts=c.shortcuts) return c.parser_manager |