diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-07-14 05:49:38 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2014-07-14 05:49:38 +0300 |
| commit | 9459fa3cede5b1a1a061cc5a15a25b2715d0d47d (patch) | |
| tree | ad6ec8bc18dbf4a75c58ee0492b81e4077e38213 /mediagoblin/tests/test_openid.py | |
| parent | 19baab1b034b31a53a0dbddd17d3f31594ce5afc (diff) | |
| download | mediagoblin-9459fa3cede5b1a1a061cc5a15a25b2715d0d47d.tar.lz mediagoblin-9459fa3cede5b1a1a061cc5a15a25b2715d0d47d.tar.xz mediagoblin-9459fa3cede5b1a1a061cc5a15a25b2715d0d47d.zip | |
Fix tests on Python 3.
Diffstat (limited to 'mediagoblin/tests/test_openid.py')
| -rw-r--r-- | mediagoblin/tests/test_openid.py | 7 |
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") |