openstack/python-manilaclient
Code Issues Proposed changes

Merge "Drop use of 'oslo' namespace package"

Browse Source
This commit is contained in:
Jenkins 2015-05-07 08:54:04 +00:00 committed by Gerrit Code Review
commit 713430a53c
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manilaclient/client.py
View File

@ -20,7 +20,7 @@
OpenStack Client interface. Handles the REST calls and responses. OpenStack Client interface. Handles the REST calls and responses.
""" """
from oslo.utils import importutils from oslo_utils import importutils
from manilaclient import exceptions from manilaclient import exceptions

2
manilaclient/config.py
View File

@ -16,7 +16,7 @@
import copy import copy
import os import os
from oslo.config import cfg from oslo_config import cfg
import oslo_log._options as log_options import oslo_log._options as log_options
# 1. Define opts # 1. Define opts

2
manilaclient/httpclient.py
View File

@ -19,7 +19,7 @@
import copy import copy
import logging import logging
from oslo.serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import strutils from oslo_utils import strutils
import requests import requests
import six import six

4
manilaclient/openstack/common/_i18n.py
View File

@ -16,7 +16,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
""" """
import oslo.i18n import oslo_i18n
# NOTE(dhellmann): This reference to o-s-l-o will be replaced by the # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
@ -24,7 +24,7 @@ import oslo.i18n
# repository. It is OK to have more than one translation function # repository. It is OK to have more than one translation function
# using the same domain, since there will still only be one message # using the same domain, since there will still only be one message
# catalog. # catalog.
_translators = oslo.i18n.TranslatorFactory(domain='manilaclient') _translators = oslo_i18n.TranslatorFactory(domain='manilaclient')
# The primary translation function using the well-known name "_" # The primary translation function using the well-known name "_"
_ = _translators.primary _ = _translators.primary

2
manilaclient/openstack/common/apiclient/base.py
View File

@ -26,7 +26,7 @@ Base utilities to build API operation managers and objects on top of.
import abc import abc
import copy import copy
from oslo.utils import strutils from oslo_utils import strutils
import six import six
from six.moves.urllib import parse from six.moves.urllib import parse

2
manilaclient/openstack/common/apiclient/client.py
View File

@ -33,7 +33,7 @@ try:
except ImportError: except ImportError:
import json import json
from oslo.utils import importutils from oslo_utils import importutils
import requests import requests
from manilaclient.openstack.common._i18n import _ from manilaclient.openstack.common._i18n import _

2
manilaclient/openstack/common/apiclient/utils.py
View File

@ -11,7 +11,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo.utils import encodeutils from oslo_utils import encodeutils
import six import six
from manilaclient.openstack.common._i18n import _ from manilaclient.openstack.common._i18n import _

4
manilaclient/openstack/common/cliutils.py
View File

@ -24,8 +24,8 @@ import os
import sys import sys
import textwrap import textwrap
from oslo.utils import encodeutils from oslo_utils import encodeutils
from oslo.utils import strutils from oslo_utils import strutils
import prettytable import prettytable
import six import six
from six import moves from six import moves

2
manilaclient/shell.py
View File

@ -29,7 +29,7 @@ import os
import pkgutil import pkgutil
import sys import sys
from oslo.utils import encodeutils from oslo_utils import encodeutils
import six import six
from manilaclient import client from manilaclient import client