Skip to content

Commit 9bc0cae

Browse files
authored
Iss496 (#511)
* #496 fix ignore encoding switch * clean encoding error implementation
1 parent 29a8ef5 commit 9bc0cae

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/canmatrix/cli/convert.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def cli_convert(infile, outfile, silent, verbosity, **options):
130130
if options["ignoreEncodingErrors"]:
131131
options["ignoreEncodingErrors"] = "ignore"
132132
else:
133-
options["ignoreEncodingErrors"] = ""
133+
options["ignoreEncodingErrors"] = "strict"
134134

135135
canmatrix.convert.convert(infile, outfile, **options)
136136
return 0

src/canmatrix/formats/arxml.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1848,9 +1848,9 @@ def decode_can_helper(ea, float_factory, ignore_cluster_info):
18481848
else: # find signal senders/receivers...
18491849
isignal_triggerings = ea.find_children_by_path(physical_channel, "I-SIGNAL-TRIGGERING")
18501850
for sig_trig in isignal_triggerings:
1851-
isignal = ea.follow_ref(sig_trig, 'SIGNAL-REF')
1851+
isignal = ea.follow_ref(sig_trig, 'SIGNAL-REF') # AR 3.2
18521852
if isignal is None:
1853-
isignal = ea.follow_ref(sig_trig, 'I-SIGNAL-REF')
1853+
isignal = ea.follow_ref(sig_trig, 'I-SIGNAL-REF') # AR4
18541854
if isignal is None:
18551855
sig_trig_text = ea.get_element_name(sig_trig) if sig_trig is not None else "None"
18561856
logger.debug("load: no isignal for %s", sig_trig_text)

src/canmatrix/formats/dbf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ def dump(mydb, f, **options):
316316
# create copy because export changes database
317317
db = copy.deepcopy(mydb)
318318
dbf_export_encoding = options.get("dbfExportEncoding", 'iso-8859-1')
319-
ignore_encoding_errors = options.get("ignoreEncodingErrors", "")
319+
ignore_encoding_errors = options.get("ignoreEncodingErrors", "strict")
320320
db.enum_attribs_to_keys()
321321
if len(db.signals) > 0:
322322
free_signals_dummy_frame = canmatrix.Frame("VECTOR__INDEPENDENT_SIG_MSG")

src/canmatrix/formats/sym.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def dump(db, f, **options): # type: (canmatrix.CanMatrix, typing.IO, **typing.A
193193
export canmatrix-object as .sym file (compatible to PEAK-Systems)
194194
"""
195195
sym_encoding = options.get('symExportEncoding', 'iso-8859-1')
196-
ignore_encoding_errors = options.get("ignoreEncodingErrors", "")
196+
ignore_encoding_errors = options.get("ignoreEncodingErrors", "strict")
197197

198198
enum_dict = {}
199199
for enum_name, enum_values in db.value_tables.items():

0 commit comments

Comments
 (0)