aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/decorators.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-05-26 19:52:18 +0300
committerBerker Peksag <berker.peksag@gmail.com>2014-05-26 19:52:18 +0300
commitfd19da346b7bcbc6310a4f53d3d224797a319e9c (patch)
tree8a1e7bf7e0357fe16955c86220b33eb6705226a2 /mediagoblin/decorators.py
parent386c9c7c55147b27c258edd5deee36594553493d (diff)
downloadmediagoblin-fd19da346b7bcbc6310a4f53d3d224797a319e9c.tar.lz
mediagoblin-fd19da346b7bcbc6310a4f53d3d224797a319e9c.tar.xz
mediagoblin-fd19da346b7bcbc6310a4f53d3d224797a319e9c.zip
Use six.moves.urllib.parse instead of the urlparse module.
Diffstat (limited to 'mediagoblin/decorators.py')
-rw-r--r--mediagoblin/decorators.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index 8515d091..61d078b2 100644
--- a/mediagoblin/decorators.py
+++ b/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