From d373ff79a859b3616824194e8cba8a6f40a7d8df Mon Sep 17 00:00:00 2001 From: Funth0mas <43621609+Funth0mas@users.noreply.github.com> Date: Wed, 18 Sep 2019 22:54:16 +0200 Subject: [PATCH] Remove cm prefix (#236) (#399) Thanks --- src/canmatrix/formats/__init__.py | 2 +- src/canmatrix/formats/{cmcsv.py => csv.py} | 2 -- src/canmatrix/formats/{cmjson.py => json.py} | 2 -- .../tests/{test_cmjson.py => test_json.py} | 16 ++++++++-------- 4 files changed, 9 insertions(+), 13 deletions(-) rename src/canmatrix/formats/{cmcsv.py => csv.py} (99%) rename src/canmatrix/formats/{cmjson.py => json.py} (99%) rename src/canmatrix/tests/{test_cmjson.py => test_json.py} (90%) diff --git a/src/canmatrix/formats/__init__.py b/src/canmatrix/formats/__init__.py index 3b965104..70eeefbe 100644 --- a/src/canmatrix/formats/__init__.py +++ b/src/canmatrix/formats/__init__.py @@ -13,7 +13,7 @@ import StringIO logger = logging.getLogger(__name__) -moduleList = ["arxml", "cmcsv", "dbc", "dbf", "cmjson", +moduleList = ["arxml", "csv", "dbc", "dbf", "json", "kcd", "fibex", "sym", "xls", "xlsx", "yaml", "scapy"] loadedFormats = [] supportedFormats = {} # type: typing.MutableMapping[str, typing.MutableSequence[str]] diff --git a/src/canmatrix/formats/cmcsv.py b/src/canmatrix/formats/csv.py similarity index 99% rename from src/canmatrix/formats/cmcsv.py rename to src/canmatrix/formats/csv.py index fcca2960..3c9d92f3 100644 --- a/src/canmatrix/formats/cmcsv.py +++ b/src/canmatrix/formats/csv.py @@ -36,8 +36,6 @@ logger = logging.getLogger(__name__) CsvDataType = typing.Union[str, int] -extension = 'csv' - class CsvRow: def __init__(self): # type: () -> None diff --git a/src/canmatrix/formats/cmjson.py b/src/canmatrix/formats/json.py similarity index 99% rename from src/canmatrix/formats/cmjson.py rename to src/canmatrix/formats/json.py index 459df00c..c90a3d98 100644 --- a/src/canmatrix/formats/cmjson.py +++ b/src/canmatrix/formats/json.py @@ -33,8 +33,6 @@ import canmatrix -extension = 'json' - def dump(db, f, **options): # type: (canmatrix.CanMatrix, typing.BinaryIO, **str) -> None diff --git a/src/canmatrix/tests/test_cmjson.py b/src/canmatrix/tests/test_json.py similarity index 90% rename from src/canmatrix/tests/test_cmjson.py rename to src/canmatrix/tests/test_json.py index 061734bd..17bb4e29 100644 --- a/src/canmatrix/tests/test_cmjson.py +++ b/src/canmatrix/tests/test_json.py @@ -33,7 +33,7 @@ def test_export_with_jsonall(default_matrix): """Check the jsonAll doesn't raise and export some additional field.""" matrix = default_matrix out_file = io.BytesIO() - canmatrix.formats.dump(matrix, out_file, "cmjson", jsonAll=True) + canmatrix.formats.dump(matrix, out_file, "json", jsonAll=True) data = out_file.getvalue().decode("utf-8") assert "my_value1" in data assert "my_value2" in data @@ -42,7 +42,7 @@ def test_export_with_jsonall(default_matrix): def test_export_additional_frame_info(default_matrix): matrix = default_matrix out_file = io.BytesIO() - canmatrix.formats.dump(matrix, out_file, "cmjson", additionalFrameAttributes="my_attribute1") + canmatrix.formats.dump(matrix, out_file, "json", additionalFrameAttributes="my_attribute1") data = out_file.getvalue().decode("utf-8") assert "my_value1" in data @@ -57,7 +57,7 @@ def test_export_long_signal_names(): frame.add_signal(signal) out_file = io.BytesIO() - canmatrix.formats.dump(matrix, out_file, "cmjson", jsonAll=True) + canmatrix.formats.dump(matrix, out_file, "json", jsonAll=True) data = json.loads(out_file.getvalue().decode("utf-8")) assert data['messages'][0]['signals'][0]['name'] == long_signal_name @@ -70,7 +70,7 @@ def test_export_min_max(): frame.add_signal(signal) matrix.add_frame(frame) out_file = io.BytesIO() - canmatrix.formats.dump(matrix, out_file, "cmjson", jsonAll=True) + canmatrix.formats.dump(matrix, out_file, "json", jsonAll=True) data = json.loads(out_file.getvalue().decode("utf-8")) assert(data['messages'][0]['signals'][0]['min'] == '-5') assert(data['messages'][0]['signals'][0]['max'] == '42') @@ -106,7 +106,7 @@ def test_import_min_max(): } ] }""" - matrix = canmatrix.formats.loads_flat(json_input, "cmjson", jsonAll=True) + matrix = canmatrix.formats.loads_flat(json_input, "json", jsonAll=True) assert matrix.frames[0].signals[0].min == -5 assert matrix.frames[0].signals[0].max == 42 @@ -140,7 +140,7 @@ def test_import_native(): } ] }""" - matrix = canmatrix.formats.loads_flat(json_input, "cmjson", jsonAll=True) + matrix = canmatrix.formats.loads_flat(json_input, "json", jsonAll=True) assert matrix.frames[0].signals[0].min == -4.2 assert matrix.frames[0].signals[0].max == 42 assert matrix.frames[0].signals[0].factor == 0.123 @@ -153,7 +153,7 @@ def test_export_native(): frame.add_signal(signal) matrix.add_frame(frame) out_file = io.BytesIO() - canmatrix.formats.dump(matrix, out_file, "cmjson", jsonNativeTypes=True) + canmatrix.formats.dump(matrix, out_file, "json", jsonNativeTypes=True) data = json.loads(out_file.getvalue().decode("utf-8")) assert (data['messages'][0]['signals'][0]['factor'] == 0.123) assert (data['messages'][0]['signals'][0]['offset'] == 1) @@ -165,7 +165,7 @@ def test_export_all_native(): frame.add_signal(signal) matrix.add_frame(frame) out_file = io.BytesIO() - canmatrix.formats.dump(matrix, out_file, "cmjson", jsonAll=True, jsonNativeTypes=True) + canmatrix.formats.dump(matrix, out_file, "json", jsonAll=True, jsonNativeTypes=True) data = json.loads(out_file.getvalue().decode("utf-8")) assert (data['messages'][0]['signals'][0]['min'] == -4.2) assert (data['messages'][0]['signals'][0]['max'] == 42)