Subclass all DataverseErrors

Author: rliebz

dataverse/connection.py

@@ -2,7 +2,7 @@
 import requests
 
 from dataverse import Dataverse
-from exceptions import DataverseError, UnauthorizedError
+from exceptions import DataverseError, UnauthorizedError, ConnectionError
 from utils import get_elements, is_not_root_dataverse
 
 
@@ -34,7 +34,7 @@ def connect(self):
         if resp.status_code == 403:
             raise UnauthorizedError('The credentials provided are invalid.')
         elif resp.status_code != 200:
-            raise DataverseError('Could not connect to the Dataverse')
+            raise ConnectionError('Could not connect to the Dataverse')
 
         self.service_document = etree.XML(resp.content)
         self.connected = True

dataverse/dataset.py

@@ -5,7 +5,10 @@
 from lxml import etree
 import requests
 
-from exceptions import DataverseError, MethodNotAllowedError, NoContainerError
+from exceptions import (
+    MethodNotAllowedError, NoContainerError, OperationFailedError,
+    ConnectionError,
+)
 from file import DataverseFile
 from settings import SWORD_BOOTSTRAP
 from utils import get_element, get_elements, get_files_in_path, add_field
@@ -91,7 +94,7 @@ def get_entry(self, refresh=False):
         resp = requests.get(self.edit_uri, auth=self.connection.auth)
 
         if resp.status_code != 200:
-            raise DataverseError('Atom entry could not be retrieved.')
+            raise ConnectionError('Atom entry could not be retrieved.')
 
         entry_string = resp.content
         self._entry = etree.XML(entry_string)
@@ -125,7 +128,7 @@ def get_statement(self, refresh=False):
         resp = requests.get(self.statement_uri, auth=self.connection.auth)
 
         if resp.status_code != 200:
-            raise DataverseError('Statement could not be retrieved.')
+            raise ConnectionError('Statement could not be retrieved.')
 
         self._statement = resp.content
         return self._statement
@@ -218,7 +221,7 @@ def publish(self):
         )
 
         if resp.status_code != 200:
-            raise DataverseError('The Dataverse could not be published.')
+            raise OperationFailedError('The Dataverse could not be published.')
 
         receipt = resp.content
         self._refresh(receipt=receipt)
@@ -235,7 +238,7 @@ def delete_file(self, dataverse_file):
         )
 
         if resp.status_code != 204:
-            raise DataverseError('The file could not be deleted.')
+            raise OperationFailedError('The file could not be deleted.')
 
     def delete_all_files(self):
         for f in self.get_files():

dataverse/dataverse.py

@@ -1,7 +1,9 @@
 import requests
 
 from dataset import Dataset
-from exceptions import DataverseError, InsufficientMetadataError, MethodNotAllowedError
+from exceptions import (
+    InsufficientMetadataError, MethodNotAllowedError, OperationFailedError,
+)
 from utils import get_element, get_elements, sanitize
 
 
@@ -50,7 +52,7 @@ def publish(self):
         )
 
         if resp.status_code != 200:
-            raise DataverseError('The Dataverse could not be published.')
+            raise OperationFailedError('The Dataverse could not be published.')
 
     def add_dataset(self, dataset):
         if get_element(dataset._entry, 'title', 'dcterms') is None:
@@ -68,7 +70,7 @@ def add_dataset(self, dataset):
         )
 
         if resp.status_code != 201:
-            raise DataverseError('This dataset could not be added.')
+            raise OperationFailedError('This dataset could not be added.')
 
         dataset.dataverse = self
         dataset._refresh(receipt=resp.content)

dataverse/exceptions.py

@@ -20,4 +20,14 @@ class MethodNotAllowedError(DataverseError):
 
 class NoContainerError(DataverseError):
     """Raised if a dataset attempts to access the server before it is added to a Dataverse"""
+    pass
+
+
+class ConnectionError(DataverseError):
+    """Raised when connection fails for an unknown reason"""
+    pass
+
+
+class OperationFailedError(DataverseError):
+    """Raised when an operation fails for an unknown reason"""
     pass