From fd19da346b7bcbc6310a4f53d3d224797a319e9c Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Mon, 26 May 2014 19:52:18 +0300 Subject: Use six.moves.urllib.parse instead of the urlparse module. --- mediagoblin/decorators.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mediagoblin/decorators.py') 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 -- cgit v1.2.3