Merge "Exception code cleanup"

1 files changed, 2 insertions, 4 deletions

diff --git a/openstack/common/exception.py b/openstack/common/exception.py
index 2a9a751..13c3bff 100644
--- a/openstack/common/exception.py
+++ b/openstack/common/exception.py
@@ -47,7 +47,7 @@ class UnknownScheme(Error):
     msg_fmt = "Unknown scheme '%s' found in URI"
 
     def __init__(self, scheme):
-        msg = self.__class__.msg_fmt % scheme
+        msg = self.msg_fmt % scheme
         super(UnknownScheme, self).__init__(msg)
 
 
@@ -56,7 +56,7 @@ class BadStoreUri(Error):
     msg_fmt = "The Store URI %s was malformed. Reason: %s"
 
     def __init__(self, uri, reason):
-        msg = self.__class__.msg_fmt % (uri, reason)
+        msg = self.msg_fmt % (uri, reason)
         super(BadStoreUri, self).__init__(msg)
 
 
@@ -100,9 +100,7 @@ def wrap_exception(f):
             return f(*args, **kw)
         except Exception as e:
             if not isinstance(e, Error):
-                #exc_type, exc_value, exc_traceback = sys.exc_info()
                 logging.exception(_('Uncaught exception'))
-                #logging.error(traceback.extract_stack(exc_traceback))
                 raise Error(str(e))
             raise
     _wrap.func_name = f.func_name