Import mock correctly on py3

This commit sponsored by Andrew McNicol.  Thank you!

diff --git a/mediagoblin/tests/test_util.py b/mediagoblin/tests/test_util.py
index e1c3c7e5f7c6e1f8bbbc3fc0bf24d2664d39b5bb..8193233fc6a6287ef30c8dfad60766c486dbbf8b 100644 (file)
--- 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