wado-rs now re-codes OSError to DICOMTrolleyError. Extends docstrings Fixes #58

Author: sjoerdk

dicomtrolley/wado_rs.py

@@ -120,7 +120,7 @@ def datasets(self, objects: Sequence[DICOMDownloadable]):
         )
 
     def download_iterator(self, downloadable: DICOMDownloadable):
-        """Perform a wado RS request and iterate over the returned datasets
+        """Perform a wado RS request and iterate over the returned datasets.
 
         Returns
         -------
@@ -147,7 +147,7 @@ def parse(self, response) -> Iterator[Dataset]:
         Raises
         ------
         DICOMTrolleyError
-            If response is not as expected or if parsing fails
+            If response is not as expected or if parsing fails.
 
         Returns
         -------
@@ -172,6 +172,10 @@ def parse(self, response) -> Iterator[Dataset]:
                     f" Response content (first 300 elements) was"
                     f" {str(response.content[:300])}"
                 ) from e
+            except OSError as e:  # pydicom might validly raise this on bad DICOM
+                raise DICOMTrolleyError(
+                    "Error parsing response as DICOM"
+                ) from e
 
     @staticmethod
     def check_for_response_errors(response):