From f51832442674a1f72c41ffce2279880109fc7ff0 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 11 Feb 2015 16:41:16 +0000
Subject: Minor tweaks based on PR feedback.

---
 synapse/appservice/api.py | 6 +++---
 synapse/http/client.py    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'synapse')

diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py
index 6192813c03..c2179f8d55 100644
--- a/synapse/appservice/api.py
+++ b/synapse/appservice/api.py
@@ -80,11 +80,11 @@ class ApplicationServiceApi(SimpleHttpClient):
         response = None
         try:
             response = yield self.put_json(
-                uri,
-                {
+                uri=uri,
+                json_body={
                     "events": events
                 },
-                {
+                args={
                     "access_token": service.hs_token
                 })
             if response:  # just an empty json object
diff --git a/synapse/http/client.py b/synapse/http/client.py
index 575510637e..7b23116556 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -95,7 +95,8 @@ class SimpleHttpClient(object):
             Deferred: Succeeds when we get *any* 2xx HTTP response, with the
             HTTP body as JSON.
         Raises:
-            On a non-2xx HTTP response.
+            On a non-2xx HTTP response. The response body will be used as the
+            error message.
         """
         if len(args):
             query_bytes = urllib.urlencode(args, True)
-- 
cgit 1.4.1