[MRG] Add error handling to convert_tag and convert_AE_string #1833
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## main #1833 +/- ##
=======================================
Coverage 97.46% 97.47%
=======================================
Files 65 65
Lines 10851 10854 +3
=======================================
+ Hits 10576 10580 +4
+ Misses 275 274 -1
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
mrbean-bremen
changed the title
darcymason
approved these changes
Jul 6, 2023
src/pydicom/values.py
Outdated
| fmt = "<HH" if is_little_endian else ">HH" | ||
| value = cast(tuple[int, int], unpack(fmt, byte_string[offset : offset + 4])) | ||
| value = cast(tuple[int, int], unpack(fmt, byte_string[offset: offset + 4])) |
There was a problem hiding this comment.
I think this should be ValueError, because it is a problem with the value, not with it's type. (I suspect I did this in the past too and maybe some need to be corrected)
There was a problem hiding this comment.
True, I was unhappy with TypeError, but for some reason did not think about ValueError. Will fix this tomorrow, I'm done for today...
- convert_AE_String handles incorrect value length gracefully - convert_tag now raises if the byte_string is too short
mrbean-bremen
force-pushed
the
skipped-tests
branch
from
d7eb53b
to
9f6ceb1
Compare
for more information, see https://pre-commit.ci
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These are minor changes related to the previously skipped tests.
convert_AE_Stringhad previously warned for incorrect length, but than crashed - it now just ignores extra bytes.convert_tagis only used inconvert_AE_String, but on the chance it is used from outside I raise an exception if the byte string is too short (instead of letting it just crash).Tasks