Updated to reflect changes in models.py, refer last commit. Using sim…

…plejson instead of jsonify.

application/api.py

@@ -3,8 +3,8 @@
 API Version is ignored in the prototype.
 """
 
-from flask import render_template, flash, url_for, redirect, json
-from flask import jsonify
+from flask import render_template, flash, url_for, redirect
+import simplejson
 import models
 from teamlist import teams
 
@@ -16,16 +16,17 @@ def team(api_version, team):
 	Only supports the 'teammetrics' project now.
 	"""
 	if team == "teammetrics":
-		return jsonify(	results={	"authorstats" : models.extractMetrics(teams[team]["authorstats"],"authorstat"),
-									"commitstats" : models.extractMetrics(teams[team]["commitstats"],"commitstat"),
-									"commitlines" : models.extractMetrics(teams[team]["commitlines"],"commitlines")
-								})
+		return simplejson.dumps(	[ models.extractMetrics(teams[team]["authorstats"],"authorstat"),
+						models.extractMetrics(teams[team]["commitstats"],"commitstat"),
+						models.extractMetrics(teams[team]["commitlines"],"commitlines")]
+								)
 	else:
 		return jsonify(results="No data available. Try 'teammetrics' as team name.")
 
 def teamMetrics(api_version, team, metric):
 	"""
 	Given a team and a particular metric, the available data is returned in JSON format.
 	"""
-	return jsonify(results=models.extractMetrics(team,metric))
+	r = models.extractMetrics(team,metric)
+	return simplejson.dumps([r,r])