aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins/api/views.py
diff options
context:
space:
mode:
authorxray7224 <xray7224@googlemail.com>2013-06-27 19:34:21 +0100
committerxray7224 <jessica@megworld.co.uk>2013-07-11 18:21:43 +0100
commit04e08d422ad179de881e4394b99f2231d1b65a90 (patch)
treeee65bd284b00d5b7704d8de9b25e0d3864d9e624 /mediagoblin/plugins/api/views.py
parent53d78991d7122c93c92cddee81a9e3768c6420e9 (diff)
downloadmediagoblin-04e08d422ad179de881e4394b99f2231d1b65a90.tar.lz
mediagoblin-04e08d422ad179de881e4394b99f2231d1b65a90.tar.xz
mediagoblin-04e08d422ad179de881e4394b99f2231d1b65a90.zip
Moves json_response into tools/json.py
Diffstat (limited to 'mediagoblin/plugins/api/views.py')
-rw-r--r--mediagoblin/plugins/api/views.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/plugins/api/views.py b/mediagoblin/plugins/api/views.py
index 9159fe65..738ea25f 100644
--- a/mediagoblin/plugins/api/views.py
+++ b/mediagoblin/plugins/api/views.py
@@ -21,11 +21,11 @@ from os.path import splitext
from werkzeug.exceptions import BadRequest, Forbidden
from werkzeug.wrappers import Response
+from mediagoblin.tools.json import json_response
from mediagoblin.decorators import require_active_login
from mediagoblin.meddleware.csrf import csrf_exempt
from mediagoblin.media_types import sniff_media
-from mediagoblin.plugins.api.tools import api_auth, get_entry_serializable, \
- json_response
+from mediagoblin.plugins.api.tools import api_auth, get_entry_serializable
from mediagoblin.submit.lib import check_file_field, prepare_queue_task, \
run_process_media, new_upload_entry