From fa3f46d7144629eed6f1f6f9abc884a1b8f4c330 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 16 Sep 2014 14:46:02 -0500
Subject: Import mock correctly on py3

This commit sponsored by Andrew McNicol.  Thank you!
---
 mediagoblin/tests/test_util.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mediagoblin/tests/test_util.py b/mediagoblin/tests/test_util.py
index e1c3c7e5..8193233f 100644
--- a/mediagoblin/tests/test_util.py
+++ b/mediagoblin/tests/test_util.py
@@ -14,7 +14,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import mock
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
 import email
 import pytest
 import smtplib
-- 
cgit v1.2.3