More flexible exception messaging.

lakesuperior/endpoints/ldp.py

@@ -290,8 +290,8 @@ def put_resource(uid):
                 stream=stream, mimetype=mimetype, handling=handling,
                 disposition=disposition)
         if not request.content_length and rsrc.is_stored:
-            raise InvalidResourceError(
-                rsrc.uid, 'Resource already exists and no data was provided.')
+            raise InvalidResourceError(rsrc.uid,
+                'Resource {} already exists and no data set was provided.')
     except InvalidResourceError as e:
         return str(e), 409
     except (ServerManagedTermError, SingleSubjectError) as e:
@@ -459,14 +459,14 @@ def uuid_for_post(parent_uid, slug=None):
 
     if nsc['fcrepo'].Pairtree in parent.types:
         raise InvalidResourceError(parent.uid,
-                'Resources cannot be created under a pairtree.')
+                'Resource {} cannot be created under a pairtree.')
 
     # Set prefix.
     if parent_uid:
         logger.debug('Parent types: {}'.format(pformat(parent.types)))
         if nsc['ldp'].Container not in parent.types:
             raise InvalidResourceError(parent_uid,
-                    'Parent {} is not a container.'.format(parent_uid))
+                    'Parent {} is not a container.')
 
         pfx = parent_uid + '/'
     else:

lakesuperior/exceptions.py

@@ -9,7 +9,7 @@ class ResourceError(RuntimeError):
     '''
     def __init__(self, uid, msg=None):
         self.uid = uid
-        self.msg = msg
+        self.msg = msg.format(uid) if msg else None
 
 
 class ResourceExistsError(ResourceError):

lakesuperior/model/ldp_factory.py

@@ -131,7 +131,7 @@ class LdpFactory:
         except:
             types = set()
         if nsc['fcrepo'].Pairtree in types:
-            raise InvalidResourceError(inst.uid)
+            raise InvalidResourceError(inst.uid, 'Resource {} is a Pairtree.')
 
         return inst
 

lakesuperior/store_layouts/ldp_rs/rsrc_centric_layout.py

@@ -387,7 +387,8 @@ class RsrcCentricLayout:
         Create a versioned UID string from a main UID and a versio n UID.
         '''
         if VERS_CONT_LABEL in uid:
-            raise ValueError('Resource \'{}\' is already a version.')
+            raise InvalidResourceError(uid,
+                    'Resource \'{}\' is already a version.')
 
         return '{}/{}/{}'.format(uid, VERS_CONT_LABEL, ver_uid)