aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Spiers <git@adamspiers.org>2015-01-09 17:26:43 +0000
committerAdam Spiers <git@adamspiers.org>2015-01-09 17:28:55 +0000
commit38d3cc3ec85c541a46c68f985f9b1a3a925bcffe (patch)
tree6fc6823e9b5d70ae2443e4b1985f2e4c886660e8
parent4f488d75a49982949de3a5bf294870e64ef2609b (diff)
downloadgit-deps-38d3cc3ec85c541a46c68f985f9b1a3a925bcffe.tar.gz
import jsonify
-rwxr-xr-xgit-deps5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-deps b/git-deps
index ddc1b24..d6a0d21 100755
--- a/git-deps
+++ b/git-deps
@@ -621,6 +621,7 @@ def serve(options):
try:
import flask
from flask import Flask, send_file, safe_join
+ from flask.json import jsonify
except ImportError:
abort("Cannot find flask module which is required for webserver mode.")
@@ -660,7 +661,7 @@ def serve(options):
@webserver.route('/options')
def send_options():
- return flask.json.jsonify(options.__dict__)
+ return jsonify(options.__dict__)
@webserver.route('/deps.json/<commitish>')
def deps(commitish):
@@ -673,7 +674,7 @@ def serve(options):
'commitish' : commitish,
'sha1': sha1.hex,
}
- return flask.json.jsonify(json)
+ return jsonify(json)
# We don't want to see double-decker warnings, so check
# WERKZEUG_RUN_MAIN which is only set for the first startup, not