Temporarily removed CBOR encoding support

Author: jtc42

poetry.lock

@@ -21,7 +21,6 @@ flask-cors = "^3.0.8"
 gevent = ">=1.4,<21.0"
 gevent-websocket = "^0.10.1"
 zeroconf = ">=0.24.5,<0.28.0"
-cbor2 = "^5.1.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^5.4"

pyproject.toml

@@ -4,7 +4,6 @@
 from flask.json import JSONEncoder
 from base64 import b64encode
 import json
-import cbor2
 
 
 from .utilities import PY3
@@ -51,24 +50,6 @@ def output_json(data, code, headers=None):
     return resp
 
 
-def encode_cbor(data, **settings):
-    """Makes CBOR encoded data using the default CBOR encoder"""
-    return cbor2.dumps(data, **settings)
-
-
-def output_cbor(data, code, headers=None):
-    """Makes a Flask response with a CBOR encoded body, using app CBOR settings"""
-
-    settings = current_app.config.get("LABTHINGS_CBOR", {})
-    dumped = encode_cbor(data, **settings)
-
-    resp = make_response(dumped, code)
-    resp.headers.extend(headers or {})
-    resp.mimetype = "application/cbor"
-    return resp
-
-
 DEFAULT_REPRESENTATIONS = [
     ("application/json", output_json),
-    ("application/cbor", output_cbor),
 ]

src/labthings/representations.py

@@ -77,16 +77,6 @@ def open(self, *args, **kwargs):
         return super().open(*args, **kwargs)
 
 
-class CborClient(FlaskClient):
-    def open(self, *args, **kwargs):
-        kwargs.setdefault(
-            "headers",
-            {"Content-Type": "application/json", "Accept": "application/cbor"},
-        )
-        kwargs.setdefault("content_type", "application/json")
-        return super().open(*args, **kwargs)
-
-
 class SocketClient(FlaskClient):
     def __init__(self, app, response_wrapper, *args, **kwargs):
         super().__init__(app, response_wrapper, *args, **kwargs)
@@ -276,12 +266,6 @@ def debug_client(debug_app):
     return debug_app.test_client()
 
 
-@pytest.fixture
-def cbor_client(app):
-    app.test_client_class = CborClient
-    return app.test_client()
-
-
 @pytest.fixture
 def text_client(app):
     return app.test_client()

tests/conftest.py

@@ -1,6 +1,5 @@
 from labthings.server import representations
 from flask import Response
-import cbor2
 import pytest
 import pickle
 import json
@@ -49,25 +48,3 @@ def test_pretty_output_json(app_ctx_debug):
     with app_ctx_debug.test_request_context():
         response = representations.output_json(data, 200)
         assert response.data == b'{\n    "key": "value"\n}\n'
-
-
-def test_encode_cbor():
-    data = {
-        "key": "value",
-        "blob": pickle.dumps(object()),
-    }
-    assert cbor2.loads(representations.encode_cbor(data)) == data
-
-
-def test_output_cbor(app_ctx):
-    data = {
-        "key": "value",
-        "blob": pickle.dumps(object()),
-    }
-
-    with app_ctx.test_request_context():
-        response = representations.output_cbor(data, 200)
-        assert isinstance(response, Response)
-        assert response.status_code == 200
-        assert response.headers.get("Content-Type") == "application/cbor"
-        assert cbor2.loads(response.data) == data

tests/test_server_representations.py

@@ -4,7 +4,6 @@
 from flask import make_response
 
 import json
-import cbor2
 
 import pytest
 
@@ -67,20 +66,6 @@ def get(self):
         assert json.loads(res.data) == {"key": "value"}
 
 
-def test_accept_default_application_cbor(app, cbor_client):
-    class Index(view.View):
-        def get(self):
-            return {"key": "value"}
-
-    app.add_url_rule("/", view_func=Index.as_view("index"))
-
-    with cbor_client:
-        res = cbor_client.get("/")
-        assert res.status_code == 200
-        assert res.content_type == "application/cbor"
-        assert cbor2.loads(res.data) == {"key": "value"}
-
-
 def test_return_response(app, client):
     class Index(view.View):
         def get(self):