Minor fixes

core-api · tomchristie · Jan 27, 2016 · Jan 27, 2016 · Jan 28, 2016 · Jan 28, 2016
commit 6bfbf927c7d2cef50a5e2c1ab061e9556941224f
diff --git a/coreapi/transports/http.py b/coreapi/transports/http.py
@@ -209,7 +209,7 @@ def transition(self, link, params=None, decoders=None, link_ancestors=None):
         response = _make_http_request(url, method, headers, query_params, form_params)
         result = _decode_result(response, decoders)
 
-        if isinstance(result, Document) and link_ancestors:
+        if (isinstance(result, Document) or result is None) and link_ancestors:
             result = _handle_inplace_replacements(result, link, link_ancestors)
 
         if isinstance(result, Error):

diff --git a/coreapi/transports/websockets.py b/coreapi/transports/websockets.py
@@ -23,7 +23,7 @@ def _decode_content(headers, content, decoders=None, base_url=None):
     return codec.load(content, base_url=base_url)
 
 
-def _diff_content(heaaders, body, diff):
+def _diff_content(headers, body, diff):
     patch = jsonpatch.JsonPatch.from_string(diff)
     previous_data = json.loads(body)
     next_data = jsonpatch.apply_patch(previous_data, patch)
@@ -44,18 +44,17 @@ class WebSocketsTransport(BaseTransport):
 
     def transition(self, link, params=None, decoders=None, link_ancestors=None):
         url = link.url
+        base_url = url.replace('wss:', 'https:').replace('ws:', 'http:')
         connection = create_connection(url)
         request = _generate_request(decoders)
         connection.send(request)
         content = connection.recv()
         headers, body = _get_headers_and_body(content)
-        yield _decode_content(headers, body, decoders=decoders, base_url=url)
+        yield _decode_content(headers, body, decoders=decoders, base_url=base_url)
         while True:
             try:
                 diff = connection.recv()
             except WebSocketConnectionClosedException:
                 return
             body = _diff_content(headers, body, diff)
-            patch = jsonpatch.JsonPatch.from_string(diff)
-            body = json.dumps(jsonpatch.apply_patch(json.loads(body), patch))
-            yield _decode_content(headers, body, decoders=decoders, base_url=url)
+            yield _decode_content(headers, body, decoders=decoders, base_url=base_url)