Skip to content

Commit 53899db

Browse files
authored
Update views.py
1 parent c92e8c0 commit 53899db

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

webapp/graphite/render/views.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from graphite.compat import HttpResponse
2525
from graphite.errors import InputParameterError, handleInputParameterError
2626
from graphite.user_util import getProfileByUsername
27-
from graphite.util import json, unpickle, pickle, msgpack, BytesIO
27+
from graphite.util import json, msgpack, BytesIO # Removed unpickle, pickle
2828
from graphite.storage import extractForwardHeaders
2929
from graphite.logger import log
3030
from graphite.render.evaluator import evaluateTarget
@@ -499,7 +499,7 @@ def delegateRendering(graphType, graphOptions, headers=None):
499499
if headers is None:
500500
headers = {}
501501
start = time()
502-
postData = (graphType + '\n').encode() + pickle.dumps(graphOptions)
502+
postData = (graphType + '\n').encode() + json.dumps(graphOptions).encode('utf-8')
503503
servers = settings.RENDERING_HOSTS[:] #make a copy so we can shuffle it safely
504504
shuffle(servers)
505505
connector_class = connector_class_selector(settings.INTRACLUSTER_HTTPS)
@@ -552,7 +552,7 @@ def renderLocalView(request):
552552
optionsPickle = reqParams.read()
553553
reqParams.close()
554554
graphClass = GraphTypes[graphType]
555-
options = unpickle.loads(optionsPickle)
555+
options = json.loads(optionsPickle.decode('utf-8'))
556556
image = doImageRender(graphClass, options)
557557
log.rendering("Delegated rendering request took %.6f seconds" % (time() - start))
558558
response = buildResponse(image)

0 commit comments

Comments
 (0)