aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins/oauth
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/plugins/oauth')
-rw-r--r--mediagoblin/plugins/oauth/tools.py2
-rw-r--r--mediagoblin/plugins/oauth/views.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/plugins/oauth/tools.py b/mediagoblin/plugins/oauth/tools.py
index 27ff32b4..1e0fc6ef 100644
--- a/mediagoblin/plugins/oauth/tools.py
+++ b/mediagoblin/plugins/oauth/tools.py
@@ -23,7 +23,7 @@ from datetime import datetime
from functools import wraps
-from mediagoblin.plugins.api.tools import json_response
+from mediagoblin.tools.json import json_response
def require_client_auth(controller):
diff --git a/mediagoblin/plugins/oauth/views.py b/mediagoblin/plugins/oauth/views.py
index d6fd314f..a5d66111 100644
--- a/mediagoblin/plugins/oauth/views.py
+++ b/mediagoblin/plugins/oauth/views.py
@@ -22,6 +22,7 @@ from urllib import urlencode
from werkzeug.exceptions import BadRequest
from mediagoblin.tools.response import render_to_response, redirect
+from mediagoblin.tools.json import json_response
from mediagoblin.decorators import require_active_login
from mediagoblin.messages import add_message, SUCCESS
from mediagoblin.tools.translate import pass_to_ugettext as _
@@ -31,7 +32,6 @@ from mediagoblin.plugins.oauth.forms import ClientRegistrationForm, \
AuthorizationForm
from mediagoblin.plugins.oauth.tools import require_client_auth, \
create_token
-from mediagoblin.plugins.api.tools import json_response
_log = logging.getLogger(__name__)