diff -Nur graphite.orig/browser/views.py graphite.new/browser/views.py --- graphite.orig/browser/views.py 2015-06-01 14:10:05.911952052 +0000 +++ graphite.new/browser/views.py 2015-06-01 14:08:42.150784361 +0000 @@ -77,7 +77,7 @@ index_file.close() result_string = ','.join(results) - return HttpResponse(result_string, mimetype='text/plain') + return HttpResponse(result_string, content_type='text/plain') def myGraphLookup(request): @@ -254,9 +254,9 @@ #json = str(nodes) #poor man's json encoder for simple types json_data = json.dumps(nodes) if jsonp: - response = HttpResponse("%s(%s)" % (jsonp, json_data),mimetype="text/javascript") + response = HttpResponse("%s(%s)" % (jsonp, json_data),content_type="text/javascript") else: - response = HttpResponse(json_data,mimetype="application/json") + response = HttpResponse(json_data,content_type="application/json") response['Pragma'] = 'no-cache' response['Cache-Control'] = 'no-cache' return response diff -Nur graphite.orig/cli/views.py graphite.new/cli/views.py --- graphite.orig/cli/views.py 2015-06-01 14:10:05.903951941 +0000 +++ graphite.new/cli/views.py 2015-06-01 14:08:42.142784250 +0000 @@ -40,7 +40,7 @@ def evaluate(request): if 'commandInput' not in request.GET: output = commands.stderr("No commandInput parameter!") - return HttpResponse(output, mimetype='text/plain') + return HttpResponse(output, content_type='text/plain') #Variable substitution profile = getProfile(request) @@ -59,7 +59,7 @@ cmd = cmd[:i] + my_vars[var] + cmd[j:] else: output = commands.stderr("Unknown variable %s" % var) - return HttpResponse(output, mimetype='text/plain') + return HttpResponse(output, content_type='text/plain') if cmd == '?': cmd = 'help' @@ -68,13 +68,13 @@ if not tokens.command: output = commands.stderr("Invalid syntax") - return HttpResponse(output, mimetype='text/plain') + return HttpResponse(output, content_type='text/plain') handler_name = '_' + tokens.command handler = vars(commands).get(handler_name) if handler is None: output = commands.stderr("Unknown command") - return HttpResponse(output, mimetype='text/plain') + return HttpResponse(output, content_type='text/plain') args = dict( tokens.items() ) del args['command'] @@ -89,4 +89,4 @@ profile.history = '\n'.join(history) profile.save() - return HttpResponse(output, mimetype='text/plain') + return HttpResponse(output, content_type='text/plain') diff -Nur graphite.orig/dashboard/views.py graphite.new/dashboard/views.py --- graphite.orig/dashboard/views.py 2015-06-01 14:10:05.911952052 +0000 +++ graphite.new/dashboard/views.py 2015-06-01 14:08:42.150784361 +0000 @@ -249,4 +249,4 @@ def json_response(obj): - return HttpResponse(mimetype='application/json', content=json.dumps(obj)) + return HttpResponse(content_type='application/json', content=json.dumps(obj)) diff -Nur graphite.orig/events/views.py graphite.new/events/views.py --- graphite.orig/events/views.py 2015-06-01 14:10:05.907951997 +0000 +++ graphite.new/events/views.py 2015-06-01 14:08:42.146784306 +0000 @@ -65,11 +65,11 @@ response = HttpResponse( "%s(%s)" % (request.REQUEST.get('jsonp'), json.dumps(fetch(request), cls=EventEncoder)), - mimetype='text/javascript') + content_type='text/javascript') else: response = HttpResponse( json.dumps(fetch(request), cls=EventEncoder), - mimetype="application/json") + content_type="application/json") return response def fetch(request): diff -Nur graphite.orig/graphlot/views.py graphite.new/graphlot/views.py --- graphite.orig/graphlot/views.py 2015-06-01 14:10:05.911952052 +0000 +++ graphite.new/graphlot/views.py 2015-06-01 14:08:42.150784361 +0000 @@ -52,7 +52,7 @@ ) for timeseries in seriesList ] if not result: raise Http404 - return HttpResponse(json.dumps(result), mimetype="application/json") + return HttpResponse(json.dumps(result), content_type="application/json") def find_metric(request): @@ -61,11 +61,11 @@ query = str( request.REQUEST['q'] ) except: return HttpResponseBadRequest( - content="Missing required parameter 'q'", mimetype="text/plain") + content="Missing required parameter 'q'", content_type="text/plain") matches = list( STORE.find(query+"*") ) content = "\n".join([node.metric_path for node in matches ]) - response = HttpResponse(content, mimetype='text/plain') + response = HttpResponse(content, content_type='text/plain') return response @@ -118,7 +118,7 @@ index_file.close() result_string = ','.join(results) - return HttpResponse(result_string, mimetype='text/plain') + return HttpResponse(result_string, content_type='text/plain') def myGraphLookup(request): @@ -256,9 +256,9 @@ jsonp = False json_data = json.dumps(nodes) if jsonp: - response = HttpResponse("%s(%s)" % (jsonp, json_data),mimetype="text/javascript") + response = HttpResponse("%s(%s)" % (jsonp, json_data),content_type="text/javascript") else: - response = HttpResponse(json_data,mimetype="application/json") + response = HttpResponse(json_data,content_type="application/json") response['Pragma'] = 'no-cache' response['Cache-Control'] = 'no-cache' return response diff -Nur graphite.orig/metrics/views.py graphite.new/metrics/views.py --- graphite.orig/metrics/views.py 2015-06-01 14:10:05.903951941 +0000 +++ graphite.new/metrics/views.py 2015-06-01 14:08:42.142784250 +0000 @@ -71,16 +71,16 @@ for m in sorted(matches) ] if jsonp: - return HttpResponse("%s(%s)" % (jsonp, json.dumps(matches)), mimetype='text/javascript') + return HttpResponse("%s(%s)" % (jsonp, json.dumps(matches)), content_type='text/javascript') else: - return HttpResponse(json.dumps(matches), mimetype='application/json') + return HttpResponse(json.dumps(matches), content_type='application/json') def search_view(request): try: query = str( request.REQUEST['query'] ) except: - return HttpResponseBadRequest(content="Missing required parameter 'query'", mimetype="text/plain") + return HttpResponseBadRequest(content="Missing required parameter 'query'", content_type="text/plain") search_request = { 'query' : query, 'max_results' : int( request.REQUEST.get('max_results', 25) ), @@ -91,7 +91,7 @@ results = sorted(searcher.search(**search_request)) result_data = json.dumps( dict(metrics=results) ) - return HttpResponse(result_data, mimetype='application/json') + return HttpResponse(result_data, content_type='application/json') def context_view(request): @@ -99,7 +99,7 @@ contexts = [] if not 'metric' not in request.GET: - return HttpResponse('{ "error" : "missing required parameter \"metric\"" }', mimetype='application/json') + return HttpResponse('{ "error" : "missing required parameter \"metric\"" }', content_type='application/json') for metric in request.GET.getlist('metric'): try: @@ -110,19 +110,19 @@ contexts.append({ 'metric' : metric, 'context' : context }) content = json.dumps( { 'contexts' : contexts } ) - return HttpResponse(content, mimetype='application/json') + return HttpResponse(content, content_type='application/json') elif request.method == 'POST': if 'metric' not in request.POST: - return HttpResponse('{ "error" : "missing required parameter \"metric\"" }', mimetype='application/json') + return HttpResponse('{ "error" : "missing required parameter \"metric\"" }', content_type='application/json') newContext = dict( item for item in request.POST.items() if item[0] != 'metric' ) for metric in request.POST.getlist('metric'): STORE.get(metric).updateContext(newContext) - return HttpResponse('{ "success" : true }', mimetype='application/json') + return HttpResponse('{ "success" : true }', content_type='application/json') else: return HttpResponseBadRequest("invalid method, must be GET or POST") @@ -140,7 +140,7 @@ try: query = str( request.REQUEST['query'] ) except: - return HttpResponseBadRequest(content="Missing required parameter 'query'", mimetype="text/plain") + return HttpResponseBadRequest(content="Missing required parameter 'query'", content_type="text/plain") if '.' in query: base_path = query.rsplit('.', 1)[0] + '.' @@ -175,11 +175,11 @@ if format == 'treejson': content = tree_json(matches, base_path, wildcards=profile.advancedUI or wildcards, contexts=contexts) - response = HttpResponse(content, mimetype='application/json') + response = HttpResponse(content, content_type='application/json') elif format == 'pickle': content = pickle_nodes(matches, contexts=contexts) - response = HttpResponse(content, mimetype='application/pickle') + response = HttpResponse(content, content_type='application/pickle') elif format == 'completer': #if len(matches) == 1 and (not matches[0].isLeaf()) and query == matches[0].metric_path + '*': # auto-complete children @@ -196,10 +196,10 @@ results.append(wildcardNode) content = json.dumps({ 'metrics' : results }) - response = HttpResponse(content, mimetype='application/json') + response = HttpResponse(content, content_type='application/json') else: - return HttpResponseBadRequest(content="Invalid value for 'format' parameter", mimetype="text/plain") + return HttpResponseBadRequest(content="Invalid value for 'format' parameter", content_type="text/plain") response['Pragma'] = 'no-cache' response['Cache-Control'] = 'no-cache' @@ -235,7 +235,7 @@ 'results' : results } - response = HttpResponse(json.dumps(result), mimetype='application/json') + response = HttpResponse(json.dumps(result), content_type='application/json') response['Pragma'] = 'no-cache' response['Cache-Control'] = 'no-cache' return response @@ -252,7 +252,7 @@ log.exception() results[metric] = dict(error="Unexpected error occurred in CarbonLink.get_metadata(%s, %s)" % (metric, key)) - return HttpResponse(json.dumps(results), mimetype='application/json') + return HttpResponse(json.dumps(results), content_type='application/json') def set_metadata_view(request): @@ -287,7 +287,7 @@ else: results = dict(error="Invalid request method") - return HttpResponse(json.dumps(results), mimetype='application/json') + return HttpResponse(json.dumps(results), content_type='application/json') def tree_json(nodes, base_path, wildcards=False, contexts=False): diff -Nur graphite.orig/render/views.py graphite.new/render/views.py --- graphite.orig/render/views.py 2015-06-01 14:10:05.907951997 +0000 +++ graphite.new/render/views.py 2015-06-01 14:08:42.146784306 +0000 @@ -116,7 +116,7 @@ format = requestOptions.get('format') if format == 'csv': - response = HttpResponse(mimetype='text/csv') + response = HttpResponse(content_type='text/csv') writer = csv.writer(response, dialect='excel') for series in data: @@ -136,16 +136,16 @@ if 'jsonp' in requestOptions: response = HttpResponse( content="%s(%s)" % (requestOptions['jsonp'], json.dumps(series_data)), - mimetype='text/javascript') + content_type='text/javascript') else: - response = HttpResponse(content=json.dumps(series_data), mimetype='application/json') + response = HttpResponse(content=json.dumps(series_data), content_type='application/json') response['Pragma'] = 'no-cache' response['Cache-Control'] = 'no-cache' return response if format == 'raw': - response = HttpResponse(mimetype='text/plain') + response = HttpResponse(content_type='text/plain') for series in data: response.write( "%s,%d,%d,%d|" % (series.name, series.start, series.end, series.step) ) response.write( ','.join(map(str,series)) ) @@ -158,7 +158,7 @@ graphOptions['outputFormat'] = 'svg' if format == 'pickle': - response = HttpResponse(mimetype='application/pickle') + response = HttpResponse(content_type='application/pickle') seriesInfo = [series.getInfo() for series in data] pickle.dump(seriesInfo, response, protocol=-1) @@ -177,7 +177,7 @@ if useSVG and 'jsonp' in requestOptions: response = HttpResponse( content="%s(%s)" % (requestOptions['jsonp'], json.dumps(image)), - mimetype='text/javascript') + content_type='text/javascript') else: response = buildResponse(image, useSVG and 'image/svg+xml' or 'image/png') @@ -385,8 +385,8 @@ return imageData -def buildResponse(imageData, mimetype="image/png"): - response = HttpResponse(imageData, mimetype=mimetype) +def buildResponse(imageData, content_type="image/png"): + response = HttpResponse(imageData, content_type=mimetype) response['Cache-Control'] = 'no-cache' response['Pragma'] = 'no-cache' return response diff -Nur graphite.orig/whitelist/views.py graphite.new/whitelist/views.py --- graphite.orig/whitelist/views.py 2015-06-01 14:10:05.907951997 +0000 +++ graphite.new/whitelist/views.py 2015-06-01 14:08:42.146784306 +0000 @@ -25,19 +25,19 @@ whitelist = load_whitelist() new_whitelist = whitelist | metrics save_whitelist(new_whitelist) - return HttpResponse(mimetype="text/plain", content="OK") + return HttpResponse(content_type="text/plain", content="OK") def remove(request): metrics = set( request.POST['metrics'].split() ) whitelist = load_whitelist() new_whitelist = whitelist - metrics save_whitelist(new_whitelist) - return HttpResponse(mimetype="text/plain", content="OK") + return HttpResponse(content_type="text/plain", content="OK") def show(request): whitelist = load_whitelist() members = '\n'.join( sorted(whitelist) ) - return HttpResponse(mimetype="text/plain", content=members) + return HttpResponse(content_type="text/plain", content=members) def load_whitelist(): fh = open(settings.WHITELIST_FILE, 'rb')