From 4ff4fa0661c96288a8d260a2e77eebf2f538db76 Mon Sep 17 00:00:00 2001 From: Kui Shi Date: Tue, 15 Oct 2013 15:31:42 +0800 Subject: [PATCH] Import exceptions module from openstack-common Partial implements: blueprint py33-support Change-Id: I5ee3e85e1adf76779831beeb0a91591d342c798d --- troveclient/service_catalog.py | 2 +- troveclient/v1/instances.py | 2 +- troveclient/v1/limits.py | 2 +- troveclient/v1/security_groups.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/troveclient/service_catalog.py b/troveclient/service_catalog.py index a5431429..e5d3b953 100644 --- a/troveclient/service_catalog.py +++ b/troveclient/service_catalog.py @@ -16,7 +16,7 @@ # limitations under the License. -from openstack.common.apiclient import exceptions +from troveclient.openstack.common.apiclient import exceptions class ServiceCatalog(object): diff --git a/troveclient/v1/instances.py b/troveclient/v1/instances.py index 3b12f023..4d7727a7 100644 --- a/troveclient/v1/instances.py +++ b/troveclient/v1/instances.py @@ -15,12 +15,12 @@ from troveclient import base -import exceptions import urlparse from troveclient.common import check_for_exceptions from troveclient.common import limit_url from troveclient.common import Paginated +from troveclient.openstack.common.apiclient import exceptions REBOOT_SOFT, REBOOT_HARD = 'SOFT', 'HARD' diff --git a/troveclient/v1/limits.py b/troveclient/v1/limits.py index 88de1a0e..3a777a6a 100644 --- a/troveclient/v1/limits.py +++ b/troveclient/v1/limits.py @@ -14,7 +14,7 @@ # under the License. from troveclient import base -import exceptions +from troveclient.openstack.common.apiclient import exceptions class Limit(base.Resource): diff --git a/troveclient/v1/security_groups.py b/troveclient/v1/security_groups.py index 5edda16d..d800106a 100644 --- a/troveclient/v1/security_groups.py +++ b/troveclient/v1/security_groups.py @@ -16,11 +16,11 @@ from troveclient import base -import exceptions import urlparse from troveclient.common import limit_url from troveclient.common import Paginated +from troveclient.openstack.common.apiclient import exceptions class SecurityGroup(base.Resource):