Fix sugar-network's head command

3 files changed, 13 insertions, 16 deletions

diff --git a/sugar-network b/sugar-network
index b294e5b..432f742 100755
--- a/sugar-network
+++ b/sugar-network
@@ -199,7 +199,7 @@ class Application(application.Application):
         request = Request()
         self._parse_path(request)
         self._parse_args([], request)
-        result = self._connect().meta(request.path, **request)
+        result = self._connect().meta(request.path, request.query)
         self._dump(result, [])
 
     @application.command(hidden=True)
diff --git a/sugar_network/toolkit/http.py b/sugar_network/toolkit/http.py
index de01442..07505c7 100644
--- a/sugar_network/toolkit/http.py
+++ b/sugar_network/toolkit/http.py
@@ -126,12 +126,12 @@ class Connection(object):
         response = self.request('GET', path, allowed=[404])
         return response.status_code != 404
 
-    def get(self, path_=None, **kwargs):
+    def get(self, path_=None, query_=None, **kwargs):
         response = self.request('GET', path_, params=kwargs)
         return self._decode_reply(response)
 
-    def meta(self, path_=None, **kwargs):
-        response = self.request('HEAD', path_, params=kwargs)
+    def meta(self, path_=None, query_=None, **kwargs):
+        response = self.request('HEAD', path_, params=query_ or kwargs)
         result = {}
         for key, value in response.headers.items():
             if key.startswith('x-sn-'):
@@ -140,18 +140,20 @@ class Connection(object):
                 result[key] = value
         return result
 
-    def post(self, path_=None, data_=None, **kwargs):
+    def post(self, path_=None, data_=None, query_=None, **kwargs):
         response = self.request('POST', path_, json.dumps(data_),
-                headers={'Content-Type': 'application/json'}, params=kwargs)
+                headers={'Content-Type': 'application/json'},
+                params=query_ or kwargs)
         return self._decode_reply(response)
 
-    def put(self, path_=None, data_=None, **kwargs):
+    def put(self, path_=None, data_=None, query_=None, **kwargs):
         response = self.request('PUT', path_, json.dumps(data_),
-                headers={'Content-Type': 'application/json'}, params=kwargs)
+                headers={'Content-Type': 'application/json'},
+                params=query_ or kwargs)
         return self._decode_reply(response)
 
-    def delete(self, path_=None, **kwargs):
-        response = self.request('DELETE', path_, params=kwargs)
+    def delete(self, path_=None, query_=None, **kwargs):
+        response = self.request('DELETE', path_, params=query_ or kwargs)
         return self._decode_reply(response)
 
     def download(self, path, dst=None):
diff --git a/tests/__init__.py b/tests/__init__.py
index 3541cea..c4d494d 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -374,12 +374,7 @@ class Test(unittest.TestCase):
         return trigger
 
     def _setup_logging(self, fork_num):
-        for handler in logging.getLogger().handlers:
-            logging.getLogger().removeHandler(handler)
-        logging.basicConfig(level=logging.DEBUG,
-                filename=join(tmpdir, '%s.log' % fork_num),
-                format='%(asctime)s %(levelname)s %(name)s: %(message)s')
-        toolkit.init_logging(10)
+        toolkit.init_logging(10, filename=join(tmpdir, '%s.log' % fork_num))
 
         sys.stdout.flush()
         sys.stderr.flush()