diff options
| author | Todd Leonhardt <todd.leonhardt@gmail.com> | 2020-04-25 12:42:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-25 12:42:37 -0400 |
| commit | d4653e6fccf0bc15d04075110769c11befb22819 (patch) | |
| tree | a04ca95d6f67bae491f290cc71036d2a4f6b168c /tests/test_run_pyscript.py | |
| parent | 9c7bbfa5bdbf8c8d81c0cd3c3cd5179d700de0b2 (diff) | |
| parent | 9b78cf4913202995dcf065ecf5077bf16fa01f95 (diff) | |
| download | cmd2-git-d4653e6fccf0bc15d04075110769c11befb22819.tar.gz | |
Merge pull request #931 from python-cmd2/branching_strategy
Added info on SemVer and branching strategy to CONTRIBUTING.md
Diffstat (limited to 'tests/test_run_pyscript.py')
| -rw-r--r-- | tests/test_run_pyscript.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_run_pyscript.py b/tests/test_run_pyscript.py index 6110e3ac..8cfd8578 100644 --- a/tests/test_run_pyscript.py +++ b/tests/test_run_pyscript.py @@ -9,7 +9,8 @@ import os import pytest from cmd2 import plugin, utils -from .conftest import run_cmd, odd_file_names + +from .conftest import odd_file_names, run_cmd # Python 3.5 had some regressions in the unitest.mock module, so use 3rd party mock if available try: |