]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd.py: make exceptions inherit from a base class
authorJosh Durgin <josh.durgin@dreamhost.com>
Wed, 21 Sep 2011 22:43:36 +0000 (15:43 -0700)
committerJosh Durgin <josh.durgin@dreamhost.com>
Tue, 27 Sep 2011 01:10:39 +0000 (18:10 -0700)
This way you can catch them all.
Also remove the unused NoData exceptions
- this was just useful for xattrs in librados.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
src/pybind/rbd.py

index 3712a2dc68f246c06ffa915fb2f4fa51d536c7a8..b2228291d825285c1c30a889612f5b42f3830ce6 100644 (file)
@@ -12,31 +12,28 @@ ADMIN_AUID = 0
 class Error(Exception):
     pass
 
-class PermissionError(Exception):
+class PermissionError(Error):
     pass
 
-class ImageNotFound(Exception):
+class ImageNotFound(Error):
     pass
 
-class NoData(Exception):
+class ImageExists(Error):
     pass
 
-class ImageExists(Exception):
+class IOError(Error):
     pass
 
-class IOError(Exception):
+class NoSpace(Error):
     pass
 
-class NoSpace(Exception):
+class IncompleteWriteError(Error):
     pass
 
-class IncompleteWriteError(Exception):
+class InvalidArgument(Error):
     pass
 
-class InvalidArgument(Exception):
-    pass
-
-class LogicError(Exception):
+class LogicError(Error):
     pass
 
 def make_ex(ret, msg):
@@ -51,8 +48,6 @@ def make_ex(ret, msg):
         return NoSpace(msg)
     elif (ret == errno.EEXIST):
         return ImageExists(msg)
-    elif (ret == errno.ENODATA):
-        return NoData(msg)
     elif (ret == errno.EINVAL):
         return InvalidArgument(msg)
     else: