diff --git a/pynetdicom/service_class.py b/pynetdicom/service_class.py index 29baac6aa..c89ef2c58 100644 --- a/pynetdicom/service_class.py +++ b/pynetdicom/service_class.py @@ -1539,7 +1539,7 @@ class QueryRetrieveServiceClass(ServiceClass): "EncapsulatedDocument", ] _SUPPORTED_UIDS = { - "C-FIND" : [ + "C-FIND": [ "1.2.840.10008.5.1.4.1.2.1.1", "1.2.840.10008.5.1.4.1.2.2.1", "1.2.840.10008.5.1.4.1.2.3.1", @@ -1551,7 +1551,7 @@ class QueryRetrieveServiceClass(ServiceClass): "1.2.840.10008.5.1.4.45.2", "1.2.840.10008.5.1.4.1.1.200.4", ], - "C-GET" : [ + "C-GET": [ "1.2.840.10008.5.1.4.1.2.1.3", "1.2.840.10008.5.1.4.1.2.2.3", "1.2.840.10008.5.1.4.1.2.3.3", @@ -1565,7 +1565,7 @@ class QueryRetrieveServiceClass(ServiceClass): "1.2.840.10008.5.1.4.45.4", "1.2.840.10008.5.1.4.1.1.200.6", ], - "C-MOVE" : [ + "C-MOVE": [ "1.2.840.10008.5.1.4.1.2.1.2", "1.2.840.10008.5.1.4.1.2.2.2", "1.2.840.10008.5.1.4.1.2.3.2", @@ -2390,7 +2390,7 @@ class BasicWorklistManagementServiceClass(QueryRetrieveServiceClass): statuses = QR_FIND_SERVICE_CLASS_STATUS _SUPPORTED_UIDS = { - "C-FIND" : ["1.2.840.10008.5.1.4.31"], + "C-FIND": ["1.2.840.10008.5.1.4.31"], } def SCP(self, req: "_QR", context: "PresentationContext") -> None: @@ -2599,7 +2599,7 @@ class SubstanceAdministrationQueryServiceClass(QueryRetrieveServiceClass): statuses = SUBSTANCE_ADMINISTRATION_SERVICE_CLASS_STATUS _SUPPORTED_UIDS = { - "C-FIND" : ["1.2.840.10008.5.1.4.41", "1.2.840.10008.5.1.4.42"], + "C-FIND": ["1.2.840.10008.5.1.4.41", "1.2.840.10008.5.1.4.42"], } def SCP(self, req: "_QR", context: "PresentationContext") -> None: diff --git a/pynetdicom/sop_class.py b/pynetdicom/sop_class.py index 3c3295ebc..8e035fabc 100644 --- a/pynetdicom/sop_class.py +++ b/pynetdicom/sop_class.py @@ -455,27 +455,27 @@ def _generate_sop_classes(sop_class_dict: Dict[str, str]) -> None: _SERVICE_TO_UID_GROUP = { - VerificationServiceClass : _VERIFICATION_CLASSES, - QueryRetrieveServiceClass : _QR_CLASSES, - StorageServiceClass : _STORAGE_CLASSES, - ApplicationEventLoggingServiceClass : _APPLICATION_EVENT_CLASSES, - BasicWorklistManagementServiceClass : _BASIC_WORKLIST_CLASSES, - ColorPaletteQueryRetrieveServiceClass : _COLOR_PALETTE_CLASSES, - DefinedProcedureProtocolQueryRetrieveServiceClass : _DEFINED_PROCEDURE_CLASSES, - DisplaySystemManagementServiceClass : _DISPLAY_SYSTEM_CLASSES, - HangingProtocolQueryRetrieveServiceClass : _HANGING_PROTOCOL_CLASSES, - ImplantTemplateQueryRetrieveServiceClass : _IMPLANT_TEMPLATE_CLASSES, - InstanceAvailabilityNotificationServiceClass : _INSTANCE_AVAILABILITY_CLASSES, - MediaCreationManagementServiceClass : _MEDIA_CREATION_CLASSES, - NonPatientObjectStorageServiceClass : _NON_PATIENT_OBJECT_CLASSES, - PrintManagementServiceClass : _PRINT_MANAGEMENT_CLASSES, - ProcedureStepServiceClass : _PROCEDURE_STEP_CLASSES, - ProtocolApprovalQueryRetrieveServiceClass : _PROTOCOL_APPROVAL_CLASSES, - RelevantPatientInformationQueryServiceClass : _RELEVANT_PATIENT_QUERY_CLASSES, - RTMachineVerificationServiceClass : _RT_MACHINE_VERIFICATION_CLASSES, - StorageCommitmentServiceClass : _STORAGE_COMMITMENT_CLASSES, - SubstanceAdministrationQueryServiceClass : _SUBSTANCE_ADMINISTRATION_CLASSES, - UnifiedProcedureStepServiceClass : _UNIFIED_PROCEDURE_STEP_CLASSES, + VerificationServiceClass: _VERIFICATION_CLASSES, + QueryRetrieveServiceClass: _QR_CLASSES, + StorageServiceClass: _STORAGE_CLASSES, + ApplicationEventLoggingServiceClass: _APPLICATION_EVENT_CLASSES, + BasicWorklistManagementServiceClass: _BASIC_WORKLIST_CLASSES, + ColorPaletteQueryRetrieveServiceClass: _COLOR_PALETTE_CLASSES, + DefinedProcedureProtocolQueryRetrieveServiceClass: _DEFINED_PROCEDURE_CLASSES, + DisplaySystemManagementServiceClass: _DISPLAY_SYSTEM_CLASSES, + HangingProtocolQueryRetrieveServiceClass: _HANGING_PROTOCOL_CLASSES, + ImplantTemplateQueryRetrieveServiceClass: _IMPLANT_TEMPLATE_CLASSES, + InstanceAvailabilityNotificationServiceClass: _INSTANCE_AVAILABILITY_CLASSES, + MediaCreationManagementServiceClass: _MEDIA_CREATION_CLASSES, + NonPatientObjectStorageServiceClass: _NON_PATIENT_OBJECT_CLASSES, + PrintManagementServiceClass: _PRINT_MANAGEMENT_CLASSES, + ProcedureStepServiceClass: _PROCEDURE_STEP_CLASSES, + ProtocolApprovalQueryRetrieveServiceClass: _PROTOCOL_APPROVAL_CLASSES, + RelevantPatientInformationQueryServiceClass: _RELEVANT_PATIENT_QUERY_CLASSES, + RTMachineVerificationServiceClass: _RT_MACHINE_VERIFICATION_CLASSES, + StorageCommitmentServiceClass: _STORAGE_COMMITMENT_CLASSES, + SubstanceAdministrationQueryServiceClass: _SUBSTANCE_ADMINISTRATION_CLASSES, + UnifiedProcedureStepServiceClass: _UNIFIED_PROCEDURE_STEP_CLASSES, } @@ -592,9 +592,7 @@ def register_uid( ) if not inspect.isclass(service_class): - raise TypeError( - "'service_class' must be a class object not a class instance" - ) + raise TypeError("'service_class' must be a class object not a class instance") if not issubclass(service_class, ServiceClass): raise TypeError( @@ -618,7 +616,6 @@ def register_uid( ) service_class._SUPPORTED_UIDS[dimse_msg_type].append(uid) else: - service_class._SUPPORTED_UIDS["C-FIND"].append(uid) diff --git a/pynetdicom/tests/test_service_qr.py b/pynetdicom/tests/test_service_qr.py index 3920885be..6cbf82ebc 100644 --- a/pynetdicom/tests/test_service_qr.py +++ b/pynetdicom/tests/test_service_qr.py @@ -6351,7 +6351,6 @@ def register_new_uid_bwm(): BasicWorklistManagementServiceClass._SUPPORTED_UIDS["C-FIND"].remove("1.2.3.4") - class TestBasicWorklistServiceClass: """Tests for BasicWorklistManagementServiceClass.""" diff --git a/pynetdicom/tests/test_service_storage.py b/pynetdicom/tests/test_service_storage.py index 5628221c2..ff5e229cf 100644 --- a/pynetdicom/tests/test_service_storage.py +++ b/pynetdicom/tests/test_service_storage.py @@ -56,7 +56,6 @@ def register_new_uid(): delattr(sop_class, "NewStorage") - class TestStorageServiceClass: """Test the StorageServiceClass""" diff --git a/pynetdicom/tests/test_sop.py b/pynetdicom/tests/test_sop.py index b960555d4..213d718c2 100644 --- a/pynetdicom/tests/test_sop.py +++ b/pynetdicom/tests/test_sop.py @@ -1,4 +1,4 @@ -"""Tests for the sop module.""" +"""Tests for the sop_class module.""" import pytest @@ -98,7 +98,7 @@ PYDICOM_VERSION = __version__.split(".")[:2] -def test_all_sopes(): +def test_all_sop_classes(): """Test that all the SOP Class UIDs are correct.""" for uid in _APPLICATION_EVENT_CLASSES.values(): assert uid in UID_dictionary @@ -166,9 +166,9 @@ def test_all_sop_instances(): class TestUIDtoSOPlass: - """Tests for uid_to_sop""" + """Tests for uid_to_sop_class""" - def test_missing_sop_cl(self): + def test_missing_sop_class(self): """Test SOP Class if UID not found.""" sop = uid_to_sop_class("1.2.3.4") assert sop == "1.2.3.4" @@ -186,7 +186,7 @@ def test_existing(self): class TestUIDToServiceClass: - """Tests for sop.uid_to_service_class.""" + """Tests for sop_class.uid_to_service_class.""" def test_service_class_uid(self): uid = "1.2.840.10008.4.2" @@ -318,7 +318,7 @@ def test_unknown_uid(self): class TestSOPClass: - """Tests for sop.SOPClass.""" + """Tests for sop_class.SOPClass.""" def test_class_type(self): """Test the class type is correct."""