aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2014-09-16 15:33:46 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2014-09-16 15:33:46 -0500
commit37865d02dddab827d3d016148274e462db03c9f2 (patch)
tree7934ab326ca15a2d571ceb8d94d33f2b5832f09d /mediagoblin
parentdd41141d238c6b9329c5250429cec50f0e174246 (diff)
downloadmediagoblin-37865d02dddab827d3d016148274e462db03c9f2.tar.lz
mediagoblin-37865d02dddab827d3d016148274e462db03c9f2.tar.xz
mediagoblin-37865d02dddab827d3d016148274e462db03c9f2.zip
decode to unicode before loading in json again, for py3
This commit sponsored by Chris Cormack. Thanks!
Diffstat (limited to 'mediagoblin')
-rw-r--r--mediagoblin/federation/views.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/federation/views.py b/mediagoblin/federation/views.py
index 3d6953a7..cff33224 100644
--- a/mediagoblin/federation/views.py
+++ b/mediagoblin/federation/views.py
@@ -139,7 +139,7 @@ def feed_endpoint(request):
return json_error("No such 'user' with id '{0}'".format(username), 404)
if request.data:
- data = json.loads(request.data)
+ data = json.loads(request.data.decode())
else:
data = {"verb": None, "object": {}}