Skip to content

Commit

Permalink
Remove usage of obsolete oslo.exception
Browse files Browse the repository at this point in the history
Change-Id: I6f46f90bd74cc26fc01667e467e3dab38037eec3
Closes-Bug: #1208734
  • Loading branch information
jd committed Aug 6, 2013
1 parent a063311 commit 0619385
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 146 deletions.
3 changes: 1 addition & 2 deletions cinder/api/extensions.py
Expand Up @@ -26,7 +26,6 @@
from cinder.api.openstack import wsgi
from cinder.api import xmlutil
from cinder import exception
from cinder.openstack.common import exception as common_exception
from cinder.openstack.common import importutils
from cinder.openstack.common import log as logging
import cinder.policy
Expand Down Expand Up @@ -373,7 +372,7 @@ def load_standard_extensions(ext_mgr, logger, path, package, ext_list=None):
(package, relpkg, dname))
try:
ext = importutils.import_class(ext_name)
except common_exception.NotFound:
except ImportError:
# extension() doesn't exist on it, so we'll explore
# the directory for ourselves
subdirs.append(dname)
Expand Down
4 changes: 2 additions & 2 deletions cinder/exception.py
Expand Up @@ -29,7 +29,6 @@
from oslo.config import cfg
import webob.exc

from cinder.openstack.common import exception as com_exception
from cinder.openstack.common import log as logging


Expand Down Expand Up @@ -78,7 +77,8 @@ def __init__(self, stdout=None, stderr=None, exit_code=None, cmd=None,
IOError.__init__(self, message)


Error = com_exception.Error
class Error(Exception):
pass


class CinderException(Exception):
Expand Down
141 changes: 0 additions & 141 deletions cinder/openstack/common/exception.py

This file was deleted.

1 change: 0 additions & 1 deletion openstack-common.conf
Expand Up @@ -4,7 +4,6 @@
module=context
module=db
module=db.sqlalchemy
module=exception
module=excutils
module=fileutils
module=flakes
Expand Down

0 comments on commit 0619385

Please sign in to comment.