Merge pull request #1098 from GLolol/tests/use-internal-mock

tests: Use internal mock from Python 3.3+ if available
This commit is contained in:
Valentin Lorentz 2015-04-28 00:23:04 +02:00
commit 758dc6d57f

View File

@ -38,9 +38,12 @@ else:
skipif = lambda x, y: lambda z:None skipif = lambda x, y: lambda z:None
try: try:
import mock from unittest import mock # Python 3.3+
except ImportError: except ImportError:
mock=None try:
import mock # Everything else, an external 'mock' library
except ImportError:
mock = None
# so complicated construction because I want to # so complicated construction because I want to
# gain the string 'y' instead of the character 'y' # gain the string 'y' instead of the character 'y'