Merge remote-tracking branch 'origin/master'

38fc89a4 · Michal Čihař · 050542ad · 9b7ff965 · 38fc89a4
Commit 38fc89a4 authored Mar 14, 2012 by Michal Čihař
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

trans/api.py trans/api.py +2 -2

No files found.
--- a/trans/api.py
+++ b/trans/api.py
@@ -32,8 +32,8 @@ def github_hook(request):
    if request.method != 'POST':
        return HttpResponseNotAllowed(['POST'])
    try:
-        data = json.loads(request.raw_post_data)
-    except ValueError:
+        data = json.loads(request.POST['payload'])
+    except (ValueError, KeyError):
        return HttpResponseBadRequest('could not parse json!')
    repo = 'git://github.com/%s/%s.git' % (
        data['repository']['owner']['name'],