Merge "Do not use openstack.common.i18n in glance client"
This commit is contained in:
@@ -44,7 +44,7 @@ from oslo_utils import strutils
|
||||
import six
|
||||
from six.moves.urllib import parse
|
||||
|
||||
from glanceclient.openstack.common._i18n import _
|
||||
from glanceclient._i18n import _
|
||||
from glanceclient.openstack.common.apiclient import exceptions
|
||||
|
||||
|
||||
|
@@ -38,7 +38,7 @@ from oslo_utils import encodeutils
|
||||
from oslo_utils import importutils
|
||||
import requests
|
||||
|
||||
from glanceclient.openstack.common._i18n import _
|
||||
from glanceclient._i18n import _
|
||||
from glanceclient.openstack.common.apiclient import exceptions
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
@@ -38,7 +38,7 @@ import sys
|
||||
|
||||
import six
|
||||
|
||||
from glanceclient.openstack.common._i18n import _
|
||||
from glanceclient._i18n import _
|
||||
|
||||
|
||||
class ClientException(Exception):
|
||||
|
@@ -28,7 +28,7 @@ from oslo_utils import encodeutils
|
||||
from oslo_utils import uuidutils
|
||||
import six
|
||||
|
||||
from glanceclient.openstack.common._i18n import _
|
||||
from glanceclient._i18n import _
|
||||
from glanceclient.openstack.common.apiclient import exceptions
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user