ENH: Support compatibility with pydicom 3 and newer

Author: jamesobutler

pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
     "requests>=2.18",
     "retrying>=1.3.3",
     "Pillow>=8.3",
-    "pydicom>=2.2",
+    "pydicom>=3.0.0",
     "typing-extensions>=4.0; python_version < '3.8.0'",
 ]
 

src/dicomweb_client/file.py

@@ -32,15 +32,7 @@
 from pydicom.datadict import dictionary_VR, keyword_for_tag, tag_for_keyword
 from pydicom.dataelem import DataElement
 from pydicom.dataset import Dataset, FileMetaDataset
-from pydicom.encaps import encapsulate
-try:
-    # pydicom >= 3.0 - parse_basic_offsets replaces get_frame_offsets
-    from pydicom.encaps import parse_basic_offsets
-    _use_parse_basic_offsets = True
-except ImportError:
-    # pydicom < 3.0 - use deprecated get_frame_offsets
-    from pydicom.encaps import get_frame_offsets
-    _use_parse_basic_offsets = False
+from pydicom.encaps import encapsulate, parse_basic_offsets
 from pydicom.errors import InvalidDicomError
 from pydicom.filebase import DicomFileLike
 from pydicom.filereader import data_element_offset_to_value, dcmread
@@ -358,13 +350,7 @@ def _read_bot(fp: DicomFileLike) -> np.ndarray:
         fp.is_implicit_VR, 'OB'
     )
     fp.seek(pixel_data_element_value_offset - 4, 1)
-
-    # Use parse_basic_offsets for pydicom >= 3.0, get_frame_offsets for < 3.0
-    if _use_parse_basic_offsets:
-        offsets = parse_basic_offsets(fp)
-    else:
-        is_empty, offsets = get_frame_offsets(fp)
-
+    offsets = parse_basic_offsets(fp)
     return np.array(offsets, dtype=np.uint32)
 
 

tests/test_web.py

@@ -1285,8 +1285,8 @@ def test_retrieve_instance_frames_rendered_png(httpserver, client, cache_dir):
 
 def test_store_instance_error_with_retries(httpserver, client, cache_dir):
     dataset = pydicom.Dataset.from_json({})
-    dataset.is_little_endian = True
-    dataset.is_implicit_VR = True
+    dataset.file_meta = pydicom.dataset.FileMetaDataset()
+    dataset.file_meta.TransferSyntaxUID = pydicom.uid.ImplicitVRLittleEndian
     max_attempts = 2
     client.set_http_retry_params(
         retry=True,
@@ -1311,8 +1311,8 @@ def test_store_instance_error_with_retries_and_additional_params(
     httpserver, client, cache_dir
 ):
     dataset = pydicom.Dataset.from_json({})
-    dataset.is_little_endian = True
-    dataset.is_implicit_VR = True
+    dataset.file_meta = pydicom.dataset.FileMetaDataset()
+    dataset.file_meta.TransferSyntaxUID = pydicom.uid.ImplicitVRLittleEndian
     max_attempts = 2
     client.set_http_retry_params(
         retry=True,
@@ -1339,8 +1339,8 @@ def test_store_instance_error_with_retries_and_additional_params(
 
 def test_store_instance_error_with_no_retries(httpserver, client, cache_dir):
     dataset = pydicom.Dataset.from_json({})
-    dataset.is_little_endian = True
-    dataset.is_implicit_VR = True
+    dataset.file_meta = pydicom.dataset.FileMetaDataset()
+    dataset.file_meta.TransferSyntaxUID = pydicom.uid.ImplicitVRLittleEndian
     client.set_http_retry_params(retry=False)
     httpserver.serve_content(
         content='',
@@ -1360,8 +1360,8 @@ def test_store_instance_error_with_no_retries_and_additional_params(
     httpserver, client, cache_dir
 ):
     dataset = pydicom.Dataset.from_json({})
-    dataset.is_little_endian = True
-    dataset.is_implicit_VR = True
+    dataset.file_meta = pydicom.dataset.FileMetaDataset()
+    dataset.file_meta.TransferSyntaxUID = pydicom.uid.ImplicitVRLittleEndian
     client.set_http_retry_params(retry=False)
     httpserver.serve_content(
         content='',