Use six.moves.urllib.parse instead of the urlparse module.

mediagoblin/decorators.py

@@ -16,10 +16,11 @@
 
 from functools import wraps
 
-from urlparse import urljoin
 from werkzeug.exceptions import Forbidden, NotFound
 from oauthlib.oauth1 import ResourceEndpoint
 
+from six.moves.urllib.parse import urljoin
+
 from mediagoblin import mg_globals as mgg
 from mediagoblin import messages
 from mediagoblin.db.models import MediaEntry, User, MediaComment

mediagoblin/plugins/api/tools.py

@@ -18,9 +18,11 @@ import logging
 import json
 
 from functools import wraps
-from urlparse import urljoin
 from werkzeug.exceptions import Forbidden
 from werkzeug.wrappers import Response
+
+from six.moves.urllib.parse import urljoin
+
 from mediagoblin import mg_globals
 from mediagoblin.tools.pluginapi import PluginManager
 from mediagoblin.storage.filestorage import BasicFileStorage

mediagoblin/plugins/oauth/forms.py

@@ -16,7 +16,7 @@
 
 import wtforms
 
-from urlparse import urlparse
+from six.moves.urllib.parse import urlparse
 
 from mediagoblin.tools.extlib.wtf_html5 import URLField
 from mediagoblin.tools.translate import lazy_pass_to_ugettext as _

mediagoblin/tests/test_auth.py

@@ -14,10 +14,12 @@
 #
 # 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 six.moves.urllib.parse as urlparse
+
 from mediagoblin import mg_globals
 from mediagoblin.db.models import User
 from mediagoblin.tests.tools import get_app, fixture_add_user

mediagoblin/tests/test_basic_auth.py

@@ -13,7 +13,8 @@
 #
 # 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 six.moves.urllib.parse as urlparse
 
 from mediagoblin.db.models import User
 from mediagoblin.plugins.basic_auth import tools as auth_tools

mediagoblin/tests/test_ldap.py

@@ -13,11 +13,13 @@
 #
 # 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.moves.urllib.parse as urlparse
+
 from mediagoblin import mg_globals
 from mediagoblin.db.base import Session
 from mediagoblin.tests.tools import get_app

mediagoblin/tests/test_notifications.py

@@ -16,7 +16,7 @@
 
 import pytest
 
-import urlparse
+import six.moves.urllib.parse as urlparse
 
 from mediagoblin.tools import template, mail
 

mediagoblin/tests/test_persona.py

@@ -13,11 +13,13 @@
 #
 # 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.moves.urllib.parse as urlparse
+
 pytest.importorskip("requests")
 
 from mediagoblin import mg_globals

mediagoblin/tests/test_submission.py

@@ -18,10 +18,11 @@ import sys
 reload(sys)
 sys.setdefaultencoding('utf-8')
 
-import urlparse
 import os
 import pytest
 
+import six.moves.urllib.parse as urlparse
+
 from mediagoblin.tests.tools import fixture_add_user
 from mediagoblin import mg_globals
 from mediagoblin.db.models import MediaEntry, User

mediagoblin/webfinger/views.py

@@ -19,7 +19,7 @@ For references, see docstring in mediagoblin/webfinger/__init__.py
 
 import re
 
-from urlparse import urlparse
+from six.moves.urllib.parse import urlparse
 
 from mediagoblin.tools.response import render_to_response, render_404