Rebase dicom.py on upstream secdev/scapy master#3
Merged
Conversation
Replace the local dicom.py with the upstream secdev/scapy version, then cherry-pick only the additions our tests/features depend on: - Transfer Syntax UID constants (IMPLICIT_VR_*, EXPLICIT_VR_*, JPEG_*, RLE_*, HTJP2K_*, etc.) - MR_IMAGE_STORAGE_SOP_CLASS_UID, SECONDARY_CAPTURE_SOP_CLASS_UID - SOP_CLASS_NAMES lookup dict - DIMSE Status Codes (STATUS_* constants, DIMSE_STATUS_CODES dict, dimse_status_repr helper) - DICOMATField for N-GET-RQ attribute_identifier_list - C_CANCEL_RQ command - N-DIMSE classes (N_EVENT_REPORT/_GET/_SET/_ACTION/_CREATE/_DELETE RQ+RSP) Targeted modifications to upstream: - DICOMUIDField.i2repr uses errors="replace" for malformed bytes - C_MOVE_RQ reorders move_destination before priority (tag-order compliance per PS3.7 Section 6.3.1) - C_STORE_RQ adds optional Move Originator fields (0000,1030/1031) - DICOMMaximumLength.mysummary shows "unlimited" for max_pdu_length=0 Diff against upstream shrinks from 1877 to ~548 lines (445 added, 4 removed) and is now nearly purely additive. All 90 tests in test/contrib/dicom.uts pass. https://claude.ai/code/session_013vPex1WoZzEyp1yXCK31Wo
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Replace the local dicom.py with the upstream secdev/scapy version, then
cherry-pick only the additions our tests/features depend on:
RLE_, HTJP2K_*, etc.)
dimse_status_repr helper)
Targeted modifications to upstream:
compliance per PS3.7 Section 6.3.1)
Diff against upstream shrinks from 1877 to ~548 lines (445 added,
4 removed) and is now nearly purely additive. All 90 tests in
test/contrib/dicom.uts pass.
https://claude.ai/code/session_013vPex1WoZzEyp1yXCK31Wo