diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-09-22 13:58:13 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-09-22 13:58:13 -0500 |
| commit | a6252cbf211691aa9d81fd535f5af7bcdbbd6620 (patch) | |
| tree | ca1131ba7a8ff0437d392c20a70f17ee7470e3dd /mediagoblin/federation | |
| parent | c47f402d7ee42e88ee1086351010dd598da6c0a5 (diff) | |
| parent | 6430ae97eca57f4db4bcef54436df6c2abcd21ad (diff) | |
| download | mediagoblin-a6252cbf211691aa9d81fd535f5af7bcdbbd6620.tar.lz mediagoblin-a6252cbf211691aa9d81fd535f5af7bcdbbd6620.tar.xz mediagoblin-a6252cbf211691aa9d81fd535f5af7bcdbbd6620.zip | |
Merge branch 'merge-python3-port'
Conflicts:
setup.py
Diffstat (limited to 'mediagoblin/federation')
| -rw-r--r-- | mediagoblin/federation/views.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/federation/views.py b/mediagoblin/federation/views.py index 724d349c..55d14e30 100644 --- a/mediagoblin/federation/views.py +++ b/mediagoblin/federation/views.py @@ -140,7 +140,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": {}} |