Browse Source

Merge "Remove all imports from oslo namespace"

changes/54/175854/1 2.24.0
Jenkins 7 years ago committed by Gerrit Code Review
parent
commit
5eab1430f2
  1. 4
      novaclient/client.py
  2. 6
      novaclient/i18n.py
  3. 4
      novaclient/shell.py
  4. 2
      novaclient/tests/unit/fixture_data/floatingips.py
  5. 2
      novaclient/tests/unit/fixture_data/hosts.py
  6. 2
      novaclient/tests/unit/fixture_data/images.py
  7. 2
      novaclient/tests/unit/fixture_data/keypairs.py
  8. 2
      novaclient/tests/unit/fixture_data/networks.py
  9. 2
      novaclient/tests/unit/fixture_data/security_group_rules.py
  10. 2
      novaclient/tests/unit/fixture_data/security_groups.py
  11. 2
      novaclient/tests/unit/fixture_data/server_groups.py
  12. 2
      novaclient/tests/unit/fixture_data/servers.py
  13. 2
      novaclient/tests/unit/utils.py
  14. 2
      novaclient/tests/unit/v2/fakes.py
  15. 2
      novaclient/tests/unit/v2/test_servers.py
  16. 2
      novaclient/tests/unit/v2/test_shell.py
  17. 4
      novaclient/utils.py
  18. 2
      novaclient/v2/flavors.py
  19. 2
      novaclient/v2/servers.py
  20. 6
      novaclient/v2/shell.py

4
novaclient/client.py

@ -28,8 +28,8 @@ import re
import socket
from keystoneclient import adapter
from oslo.utils import importutils
from oslo.utils import netutils
from oslo_utils import importutils
from oslo_utils import netutils
import requests
from requests import adapters

6
novaclient/i18n.py

@ -10,16 +10,16 @@
# License for the specific language governing permissions and limitations
# under the License.
"""oslo.i18n integration module for novaclient.
"""oslo_i18n integration module for novaclient.
See http://docs.openstack.org/developer/oslo.i18n/usage.html .
"""
from oslo import i18n
import oslo_i18n
_translators = i18n.TranslatorFactory(domain='novaclient')
_translators = oslo_i18n.TranslatorFactory(domain='novaclient')
# The primary translation function using the well-known name "_"
_ = _translators.primary

4
novaclient/shell.py

@ -33,8 +33,8 @@ from keystoneclient.auth.identity.generic import password
from keystoneclient.auth.identity.generic import token
from keystoneclient.auth.identity import v3 as identity
from keystoneclient import session as ksession
from oslo.utils import encodeutils
from oslo.utils import strutils
from oslo_utils import encodeutils
from oslo_utils import strutils
import pkg_resources
import six

2
novaclient/tests/unit/fixture_data/floatingips.py

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
from novaclient.tests.unit import fakes
from novaclient.tests.unit.fixture_data import base

2
novaclient/tests/unit/fixture_data/hosts.py

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
from six.moves.urllib import parse
from novaclient.tests.unit.fixture_data import base

2
novaclient/tests/unit/fixture_data/images.py

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
from novaclient.tests.unit import fakes
from novaclient.tests.unit.fixture_data import base

2
novaclient/tests/unit/fixture_data/keypairs.py

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
from novaclient.tests.unit import fakes
from novaclient.tests.unit.fixture_data import base

2
novaclient/tests/unit/fixture_data/networks.py

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
from novaclient.tests.unit.fixture_data import base

2
novaclient/tests/unit/fixture_data/security_group_rules.py

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
from novaclient.tests.unit import fakes
from novaclient.tests.unit.fixture_data import base

2
novaclient/tests/unit/fixture_data/security_groups.py

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
from novaclient.tests.unit import fakes
from novaclient.tests.unit.fixture_data import base

2
novaclient/tests/unit/fixture_data/server_groups.py

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
from novaclient.tests.unit.fixture_data import base

2
novaclient/tests/unit/fixture_data/servers.py

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
from novaclient.tests.unit import fakes
from novaclient.tests.unit.fixture_data import base

2
novaclient/tests/unit/utils.py

@ -15,7 +15,7 @@ import os
import fixtures
import mock
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
import requests
from requests_mock.contrib import fixture as requests_mock_fixture
import six

2
novaclient/tests/unit/v2/fakes.py

@ -17,7 +17,7 @@
import datetime
import mock
from oslo.utils import strutils
from oslo_utils import strutils
import six
from six.moves.urllib import parse

2
novaclient/tests/unit/v2/test_servers.py

@ -13,7 +13,7 @@
# under the License.
import mock
from oslo.serialization import jsonutils
from oslo_serialization import jsonutils
import six
from novaclient import exceptions

2
novaclient/tests/unit/v2/test_shell.py

@ -22,7 +22,7 @@ import os
import fixtures
import mock
from oslo.utils import timeutils
from oslo_utils import timeutils
import six
from six.moves import builtins

4
novaclient/utils.py

@ -18,8 +18,8 @@ import textwrap
import time
import uuid
from oslo.serialization import jsonutils
from oslo.utils import encodeutils
from oslo_serialization import jsonutils
from oslo_utils import encodeutils
import pkg_resources
import prettytable
import six

2
novaclient/v2/flavors.py

@ -16,7 +16,7 @@
Flavor interface.
"""
from oslo.utils import strutils
from oslo_utils import strutils
from six.moves.urllib import parse
from novaclient import base

2
novaclient/v2/servers.py

@ -21,7 +21,7 @@ Server interface.
import base64
from oslo.utils import encodeutils
from oslo_utils import encodeutils
import six
from six.moves.urllib import parse

6
novaclient/v2/shell.py

@ -28,9 +28,9 @@ import os
import sys
import time
from oslo.utils import encodeutils
from oslo.utils import strutils
from oslo.utils import timeutils
from oslo_utils import encodeutils
from oslo_utils import strutils
from oslo_utils import timeutils
import six
from novaclient import client

Loading…
Cancel
Save