Add back in use of 3rd-party mock module for Python 3.5

tleonhardt · tleonhardt · commit 1d66e283490d · 2018-04-15T13:28:48.000-07:00
Apparently there were some issues in the unitest.mock module in Python 3.5 (but not 3.4 or 3.6)
diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
@@ -6,20 +6,22 @@
 Released under MIT license, see LICENSE file
 """
 import argparse
+from code import InteractiveConsole
 import os
 import sys
 import io
 import tempfile
 
-from unittest import mock
 import pytest
 import six
-
-from code import InteractiveConsole
-
-# Used for sm.input: raw_input() for Python 2 or input() for Python 3
 import six.moves as sm
 
+# Python 3.5 had some regressions in the unitest.mock module, so use 3rd party mock if available
+try:
+    import mock
+except ImportError:
+    from unittest import mock
+
 import cmd2
 from conftest import run_cmd, normalize, BASE_HELP, BASE_HELP_VERBOSE, \
     HELP_HISTORY, SHORTCUTS_TXT, SHOW_TXT, SHOW_LONG, StdOut
diff --git a/tox.ini b/tox.ini
@@ -22,6 +22,7 @@ commands = py.test -v -n2 --forked
 
 [testenv:py35]
 deps =
+  mock
   pyparsing
   pyperclip
   pytest
@@ -33,6 +34,7 @@ commands = py.test -v -n2 --forked
 
 [testenv:py35-win]
 deps =
+  mock
   pyparsing
   pyperclip
   pyreadline
