aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins/api
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/plugins/api')
-rw-r--r--mediagoblin/plugins/api/tools.py2
-rw-r--r--mediagoblin/plugins/api/views.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/mediagoblin/plugins/api/tools.py b/mediagoblin/plugins/api/tools.py
index eff9009d..954b6e8b 100644
--- a/mediagoblin/plugins/api/tools.py
+++ b/mediagoblin/plugins/api/tools.py
@@ -21,7 +21,7 @@ from functools import wraps
from werkzeug.exceptions import Forbidden
from werkzeug.wrappers import Response
-from six.moves.urllib.parse import urljoin
+from urllib.parse import urljoin
from mediagoblin import mg_globals
from mediagoblin.tools.pluginapi import PluginManager
diff --git a/mediagoblin/plugins/api/views.py b/mediagoblin/plugins/api/views.py
index 84f919b4..85254a8c 100644
--- a/mediagoblin/plugins/api/views.py
+++ b/mediagoblin/plugins/api/views.py
@@ -17,8 +17,6 @@
import json
import logging
-import six
-
from werkzeug.exceptions import BadRequest
from werkzeug.wrappers import Response