From 3a02813c7a70bb2e919101343a0680fe1aa34a81 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 16 Sep 2014 14:26:40 -0500 Subject: [PATCH] Import mock from unittest if on py3 --- mediagoblin/tests/test_api.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mediagoblin/tests/test_api.py b/mediagoblin/tests/test_api.py index 329c387d..31bf50b3 100644 --- a/mediagoblin/tests/test_api.py +++ b/mediagoblin/tests/test_api.py @@ -15,7 +15,10 @@ # along with this program. If not, see . import json -import mock +try: + import mock +except ImportError: + import unittest.mock as mock import pytest from webtest import AppError -- 2.25.1