diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-09-16 14:26:40 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-09-16 14:26:40 -0500 |
| commit | 3a02813c7a70bb2e919101343a0680fe1aa34a81 (patch) | |
| tree | 52778b739f4b4c8eed1ca190a929b41596d57f28 /mediagoblin/tests/test_api.py | |
| parent | f6bad0eb26fa7e092570afe1fb7f38b3d1a1941d (diff) | |
| download | mediagoblin-3a02813c7a70bb2e919101343a0680fe1aa34a81.tar.lz mediagoblin-3a02813c7a70bb2e919101343a0680fe1aa34a81.tar.xz mediagoblin-3a02813c7a70bb2e919101343a0680fe1aa34a81.zip | |
Import mock from unittest if on py3
Diffstat (limited to 'mediagoblin/tests/test_api.py')
| -rw-r--r-- | mediagoblin/tests/test_api.py | 5 |
1 files changed, 4 insertions, 1 deletions
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 <http://www.gnu.org/licenses/>. import json -import mock +try: + import mock +except ImportError: + import unittest.mock as mock import pytest from webtest import AppError |