From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Wed, 21 Sep 2011 22:43:36 +0000 (-0700)
Subject: rbd.py: make exceptions inherit from a base class
X-Git-Tag: v0.37~148
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a381294e92d421037fdd4f97d38e80d1558bac81;p=ceph.git

rbd.py: make exceptions inherit from a base class

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>
---

diff --git a/src/pybind/rbd.py b/src/pybind/rbd.py
index 3712a2dc68f..b2228291d82 100644
--- a/src/pybind/rbd.py
+++ b/src/pybind/rbd.py
@@ -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: