Skip to content

Small refactor after tertiary bitmap decoder update #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knovichikhin merged 1 commit into from
Aug 10, 2025
Merged

Small refactor after tertiary bitmap decoder update #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 16 additions & 24 deletions iso8583/decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,38 +115,30 @@ def decode(
idx = _decode_type(s, doc_dec, doc_enc, idx, spec)
idx = _decode_bitmap(s, doc_dec, doc_enc, idx, "p", spec, primary_fields)

# Parse secondary bitmap if present
if 1 in primary_fields:
idx = _decode_bitmap(s, doc_dec, doc_enc, idx, "1", spec, secondary_fields)

# `field_key` can be used to throw an exception after the loop.
# `field` can be used to throw an exception after the loop.
# So, create it here in case the `fields` set is empty
# and never enters the loop to create the variable.
# Set `field_key` to the last mandatory one: primary bitmap.
field_key = "p"

for field_key in [str(i) for i in sorted(primary_fields)]:
# Secondary bitmap is already decoded
if field_key == "1":
continue
idx = _decode_field(s, doc_dec, doc_enc, idx, field_key, spec[field_key])
# Set `field` to the last mandatory one: primary bitmap.
field = "p"

# Parse tertiary bitmap if present
if 65 in secondary_fields:
idx = _decode_bitmap(s, doc_dec, doc_enc, idx, "65", spec, tertiary_fields)
for field in [str(i) for i in sorted(primary_fields)]:
if field == "1":
idx = _decode_bitmap(s, doc_dec, doc_enc, idx, "1", spec, secondary_fields)
else:
idx = _decode_field(s, doc_dec, doc_enc, idx, field, spec[field])

for field_key in [str(i) for i in sorted(secondary_fields)]:
# Tertiary bitmap is already decoded
if field_key == "65":
continue
idx = _decode_field(s, doc_dec, doc_enc, idx, field_key, spec[field_key])
for field in [str(i) for i in sorted(secondary_fields)]:
if field == "65":
idx = _decode_bitmap(s, doc_dec, doc_enc, idx, "65", spec, tertiary_fields)
else:
idx = _decode_field(s, doc_dec, doc_enc, idx, field, spec[field])

for field_key in [str(i) for i in sorted(tertiary_fields)]:
idx = _decode_field(s, doc_dec, doc_enc, idx, field_key, spec[field_key])
for field in [str(i) for i in sorted(tertiary_fields)]:
idx = _decode_field(s, doc_dec, doc_enc, idx, field, spec[field])

if idx != len(s):
raise DecodeError(
"Extra data after last field", s, doc_dec, doc_enc, idx, field_key
"Extra data after last field", s, doc_dec, doc_enc, idx, field
)

return doc_dec, doc_enc
Expand Down