DOc fixes

Author: CPBridge

docs/conf.py

@@ -13,6 +13,7 @@
 import os
 import sys
 import pkg_resources
+import datetime
 
 source_dir = os.path.dirname(__file__)
 pkg_dir = os.path.join(source_dir, '..', '..', 'src', 'highdicom')
@@ -21,7 +22,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'highdicom'
-copyright = '2020-2022, Herrmann Lab'
+copyright = f'2020-{datetime.datetime.now().year}, highdicom contributors'
 author = 'Markus D. Herrmann'
 
 # The full version, including alpha/beta/rc tags

src/highdicom/ann/content.py

@@ -167,7 +167,7 @@ def from_dataset(
             )
         ]
 
-        return cast(cls, measurements)
+        return cast(Self, measurements)
 
 
 class AnnotationGroup(Dataset):
@@ -840,4 +840,4 @@ def from_dataset(
                 for ds in group.PrimaryAnatomicStructureSequence
             ]
 
-        return cast(cls, group)
+        return cast(Self, group)

src/highdicom/ann/sop.py

@@ -453,7 +453,7 @@ def from_dataset(
             for item in ann.AnnotationGroupSequence
         ]
 
-        return cast(cls, ann)
+        return cast(Self, ann)
 
 
 def annread(

src/highdicom/content.py

@@ -148,7 +148,7 @@ def from_sequence(
         else:
             algo_id_sequence = sequence
         algo_id_sequence.__class__ = cls
-        return cast(cls, algo_id_sequence)
+        return cast(Self, algo_id_sequence)
 
     @property
     def name(self) -> str:
@@ -402,7 +402,7 @@ def from_sequence(
         else:
             pixel_measures = sequence
         pixel_measures.__class__ = cls
-        return cast(cls, pixel_measures)
+        return cast(Self, pixel_measures)
 
     def __eq__(self, other: DataElementSequence) -> bool:
         """Determine whether two sets of pixel measures are the same.
@@ -617,7 +617,7 @@ def from_sequence(
         else:
             plane_position = sequence
         plane_position.__class__ = cls
-        return cast(cls, plane_position)
+        return cast(Self, plane_position)
 
 
 class PlaneOrientationSequence(DataElementSequence):
@@ -754,7 +754,7 @@ def from_sequence(
         else:
             plane_orientation = sequence
         plane_orientation.__class__ = cls
-        return cast(cls, plane_orientation)
+        return cast(Self, plane_orientation)
 
 
 class IssuerOfIdentifier(Dataset):
@@ -852,7 +852,7 @@ def from_dataset(
         issuer_of_identifier._issuer_of_identifier = issuer_id
         issuer_of_identifier._issuer_of_identifier_type = issuer_type
 
-        return cast(cls, issuer_of_identifier)
+        return cast(Self, issuer_of_identifier)
 
 
 class SpecimenCollection(ContentSequence):
@@ -2037,7 +2037,7 @@ def from_dataset(
 
         dataset_copy = dataset
         dataset_copy.__class__ = cls
-        return cast(cls, dataset_copy)
+        return cast(Self, dataset_copy)
 
     def get_scaled_lut_data(
         self,
@@ -2960,7 +2960,7 @@ def extract_from_dataset(cls, dataset: Dataset, color: str) -> Self:
             setattr(new_ds, kw, getattr(dataset, kw))
 
         new_ds.__class__ = cls
-        return cast(cls, new_ds)
+        return cast(Self, new_ds)
 
 
 class SegmentedPaletteColorLUT(Dataset):
@@ -3200,7 +3200,7 @@ def extract_from_dataset(cls, dataset: Dataset, color: str) -> Self:
             setattr(new_ds, kw, getattr(dataset, kw))
 
         new_ds.__class__ = cls
-        return cast(cls, new_ds)
+        return cast(Self, new_ds)
 
 
 class PaletteColorLUTTransformation(Dataset):
@@ -3612,7 +3612,7 @@ def extract_from_dataset(cls, dataset: Dataset) -> Self:
             setattr(new_dataset, data_kw, data)
 
         new_dataset.__class__ = cls
-        return cast(cls, new_dataset)
+        return cast(Self, new_dataset)
 
     def apply(
         self,

src/highdicom/image.py

@@ -1147,7 +1147,7 @@ def from_dataset(
         else:
             im = dataset
         im.__class__ = cls
-        im = cast(cls, im)
+        im = cast(Self, im)
 
         im._build_luts()
         return im

src/highdicom/ko/content.py

@@ -177,7 +177,7 @@ def from_sequence(
             )
         instance = ContentSequence.from_sequence(sequence, is_root=True)
         instance.__class__ = cls
-        return cast(cls, instance)
+        return cast(Self, instance)
 
     def get_observer_contexts(
         self,

src/highdicom/ko/sop.py

@@ -230,4 +230,4 @@ def from_dataset(cls, dataset: Dataset) -> Self:
                         sop_instance_uid
                     )
 
-        return cast(cls, sop_instance)
+        return cast(Self, sop_instance)

src/highdicom/sc/sop.py

@@ -499,8 +499,7 @@ def from_ref_dataset(
             column dimension
         laterality: Union[str, highdicom.LateralityValues, None], optional
             Laterality of the examined body part
-        patient_orientation:
-                Union[Tuple[str, str], Tuple[highdicom.PatientOrientationValuesBiped, highdicom.PatientOrientationValuesBiped], Tuple[highdicom.PatientOrientationValuesQuadruped, highdicom.PatientOrientationValuesQuadruped], None], optional
+        patient_orientation: Union[Tuple[str, str], Tuple[highdicom.PatientOrientationValuesBiped, highdicom.PatientOrientationValuesBiped], Tuple[highdicom.PatientOrientationValuesQuadruped, highdicom.PatientOrientationValuesQuadruped], None], optional
             Orientation of the patient along the row and column axes of the
             image (required if `coordinate_system` is ``"PATIENT"``)
         anatomical_orientation_type: Union[str, highdicom.AnatomicalOrientationTypeValues, None], optional

src/highdicom/seg/content.py

@@ -232,7 +232,7 @@ def from_dataset(
                 CodedConcept.from_dataset(ds, copy=False)
                 for ds in desc.PrimaryAnatomicStructureSequence
             ]
-        return cast(cls, desc)
+        return cast(Self, desc)
 
     @property
     def segment_number(self) -> int:

src/highdicom/seg/sop.py

@@ -2855,7 +2855,7 @@ def from_dataset(
 
         seg = super().from_dataset(seg, copy=False)
 
-        return cast(cls, seg)
+        return cast(Self, seg)
 
     @property
     def segmentation_type(self) -> SegmentationTypeValues: