aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_openid.py
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/tests/test_openid.py')
-rw-r--r--mediagoblin/tests/test_openid.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/mediagoblin/tests/test_openid.py b/mediagoblin/tests/test_openid.py
index 7ef01052..a3ab176a 100644
--- a/mediagoblin/tests/test_openid.py
+++ b/mediagoblin/tests/test_openid.py
@@ -14,11 +14,14 @@
# 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 urlparse
import pkg_resources
import pytest
-import mock
import six
+import six.moves.urllib.parse as urlparse
+try:
+ import mock
+except ImportError:
+ import unittest.mock as mock
openid_consumer = pytest.importorskip(
"openid.consumer.consumer")