summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-20 22:42:54 +0000
committerGerrit Code Review <review@openstack.org>2015-04-20 22:42:54 +0000
commit5eab1430f2a7a91e2df22405913f328c9870b2e3 (patch)
tree78e928775a6a13d41ba2983de9d088b12dcb47c0
parent2b1f70c4ff6dc609a1c719673fb9ff4914211356 (diff)
parentccff3d3c948c1b0b3ce28f6928e39915b16d80ee (diff)
Merge "Remove all imports from oslo namespace"2.24.0
-rw-r--r--novaclient/client.py4
-rw-r--r--novaclient/i18n.py6
-rw-r--r--novaclient/shell.py4
-rw-r--r--novaclient/tests/unit/fixture_data/floatingips.py2
-rw-r--r--novaclient/tests/unit/fixture_data/hosts.py2
-rw-r--r--novaclient/tests/unit/fixture_data/images.py2
-rw-r--r--novaclient/tests/unit/fixture_data/keypairs.py2
-rw-r--r--novaclient/tests/unit/fixture_data/networks.py2
-rw-r--r--novaclient/tests/unit/fixture_data/security_group_rules.py2
-rw-r--r--novaclient/tests/unit/fixture_data/security_groups.py2
-rw-r--r--novaclient/tests/unit/fixture_data/server_groups.py2
-rw-r--r--novaclient/tests/unit/fixture_data/servers.py2
-rw-r--r--novaclient/tests/unit/utils.py2
-rw-r--r--novaclient/tests/unit/v2/fakes.py2
-rw-r--r--novaclient/tests/unit/v2/test_servers.py2
-rw-r--r--novaclient/tests/unit/v2/test_shell.py2
-rw-r--r--novaclient/utils.py4
-rw-r--r--novaclient/v2/flavors.py2
-rw-r--r--novaclient/v2/servers.py2
-rw-r--r--novaclient/v2/shell.py6
20 files changed, 27 insertions, 27 deletions
diff --git a/novaclient/client.py b/novaclient/client.py
index 007cf91..85d618d 100644
--- a/novaclient/client.py
+++ b/novaclient/client.py
@@ -28,8 +28,8 @@ import re
28import socket 28import socket
29 29
30from keystoneclient import adapter 30from keystoneclient import adapter
31from oslo.utils import importutils 31from oslo_utils import importutils
32from oslo.utils import netutils 32from oslo_utils import netutils
33import requests 33import requests
34from requests import adapters 34from requests import adapters
35 35
diff --git a/novaclient/i18n.py b/novaclient/i18n.py
index e9d39d4..6a17312 100644
--- a/novaclient/i18n.py
+++ b/novaclient/i18n.py
@@ -10,16 +10,16 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13"""oslo.i18n integration module for novaclient. 13"""oslo_i18n integration module for novaclient.
14 14
15See http://docs.openstack.org/developer/oslo.i18n/usage.html . 15See http://docs.openstack.org/developer/oslo.i18n/usage.html .
16 16
17""" 17"""
18 18
19from oslo import i18n 19import oslo_i18n
20 20
21 21
22_translators = i18n.TranslatorFactory(domain='novaclient') 22_translators = oslo_i18n.TranslatorFactory(domain='novaclient')
23 23
24# The primary translation function using the well-known name "_" 24# The primary translation function using the well-known name "_"
25_ = _translators.primary 25_ = _translators.primary
diff --git a/novaclient/shell.py b/novaclient/shell.py
index 439a98d..4e7b5c9 100644
--- a/novaclient/shell.py
+++ b/novaclient/shell.py
@@ -33,8 +33,8 @@ from keystoneclient.auth.identity.generic import password
33from keystoneclient.auth.identity.generic import token 33from keystoneclient.auth.identity.generic import token
34from keystoneclient.auth.identity import v3 as identity 34from keystoneclient.auth.identity import v3 as identity
35from keystoneclient import session as ksession 35from keystoneclient import session as ksession
36from oslo.utils import encodeutils 36from oslo_utils import encodeutils
37from oslo.utils import strutils 37from oslo_utils import strutils
38import pkg_resources 38import pkg_resources
39import six 39import six
40 40
diff --git a/novaclient/tests/unit/fixture_data/floatingips.py b/novaclient/tests/unit/fixture_data/floatingips.py
index 10772a7..f5ad1c1 100644
--- a/novaclient/tests/unit/fixture_data/floatingips.py
+++ b/novaclient/tests/unit/fixture_data/floatingips.py
@@ -10,7 +10,7 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13from oslo.serialization import jsonutils 13from oslo_serialization import jsonutils
14 14
15from novaclient.tests.unit import fakes 15from novaclient.tests.unit import fakes
16from novaclient.tests.unit.fixture_data import base 16from novaclient.tests.unit.fixture_data import base
diff --git a/novaclient/tests/unit/fixture_data/hosts.py b/novaclient/tests/unit/fixture_data/hosts.py
index 5c1ff60..28ff17e 100644
--- a/novaclient/tests/unit/fixture_data/hosts.py
+++ b/novaclient/tests/unit/fixture_data/hosts.py
@@ -10,7 +10,7 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13from oslo.serialization import jsonutils 13from oslo_serialization import jsonutils
14from six.moves.urllib import parse 14from six.moves.urllib import parse
15 15
16from novaclient.tests.unit.fixture_data import base 16from novaclient.tests.unit.fixture_data import base
diff --git a/novaclient/tests/unit/fixture_data/images.py b/novaclient/tests/unit/fixture_data/images.py
index 4ec4725..0eb8a14 100644
--- a/novaclient/tests/unit/fixture_data/images.py
+++ b/novaclient/tests/unit/fixture_data/images.py
@@ -10,7 +10,7 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13from oslo.serialization import jsonutils 13from oslo_serialization import jsonutils
14 14
15from novaclient.tests.unit import fakes 15from novaclient.tests.unit import fakes
16from novaclient.tests.unit.fixture_data import base 16from novaclient.tests.unit.fixture_data import base
diff --git a/novaclient/tests/unit/fixture_data/keypairs.py b/novaclient/tests/unit/fixture_data/keypairs.py
index 9314c58..64d102e 100644
--- a/novaclient/tests/unit/fixture_data/keypairs.py
+++ b/novaclient/tests/unit/fixture_data/keypairs.py
@@ -10,7 +10,7 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13from oslo.serialization import jsonutils 13from oslo_serialization import jsonutils
14 14
15from novaclient.tests.unit import fakes 15from novaclient.tests.unit import fakes
16from novaclient.tests.unit.fixture_data import base 16from novaclient.tests.unit.fixture_data import base
diff --git a/novaclient/tests/unit/fixture_data/networks.py b/novaclient/tests/unit/fixture_data/networks.py
index 9ef692c..d2743fc 100644
--- a/novaclient/tests/unit/fixture_data/networks.py
+++ b/novaclient/tests/unit/fixture_data/networks.py
@@ -10,7 +10,7 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13from oslo.serialization import jsonutils 13from oslo_serialization import jsonutils
14 14
15from novaclient.tests.unit.fixture_data import base 15from novaclient.tests.unit.fixture_data import base
16 16
diff --git a/novaclient/tests/unit/fixture_data/security_group_rules.py b/novaclient/tests/unit/fixture_data/security_group_rules.py
index 5f1d2fa..d0806c5 100644
--- a/novaclient/tests/unit/fixture_data/security_group_rules.py
+++ b/novaclient/tests/unit/fixture_data/security_group_rules.py
@@ -10,7 +10,7 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13from oslo.serialization import jsonutils 13from oslo_serialization import jsonutils
14 14
15from novaclient.tests.unit import fakes 15from novaclient.tests.unit import fakes
16from novaclient.tests.unit.fixture_data import base 16from novaclient.tests.unit.fixture_data import base
diff --git a/novaclient/tests/unit/fixture_data/security_groups.py b/novaclient/tests/unit/fixture_data/security_groups.py
index ac5d182..c1a3073 100644
--- a/novaclient/tests/unit/fixture_data/security_groups.py
+++ b/novaclient/tests/unit/fixture_data/security_groups.py
@@ -10,7 +10,7 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13from oslo.serialization import jsonutils 13from oslo_serialization import jsonutils
14 14
15from novaclient.tests.unit import fakes 15from novaclient.tests.unit import fakes
16from novaclient.tests.unit.fixture_data import base 16from novaclient.tests.unit.fixture_data import base
diff --git a/novaclient/tests/unit/fixture_data/server_groups.py b/novaclient/tests/unit/fixture_data/server_groups.py
index 1fcfdea..bf4c82d 100644
--- a/novaclient/tests/unit/fixture_data/server_groups.py
+++ b/novaclient/tests/unit/fixture_data/server_groups.py
@@ -10,7 +10,7 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13from oslo.serialization import jsonutils 13from oslo_serialization import jsonutils
14 14
15from novaclient.tests.unit.fixture_data import base 15from novaclient.tests.unit.fixture_data import base
16 16
diff --git a/novaclient/tests/unit/fixture_data/servers.py b/novaclient/tests/unit/fixture_data/servers.py
index 3766f42..0bece96 100644
--- a/novaclient/tests/unit/fixture_data/servers.py
+++ b/novaclient/tests/unit/fixture_data/servers.py
@@ -10,7 +10,7 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13from oslo.serialization import jsonutils 13from oslo_serialization import jsonutils
14 14
15from novaclient.tests.unit import fakes 15from novaclient.tests.unit import fakes
16from novaclient.tests.unit.fixture_data import base 16from novaclient.tests.unit.fixture_data import base
diff --git a/novaclient/tests/unit/utils.py b/novaclient/tests/unit/utils.py
index ab1ddcd..6aaf0ed 100644
--- a/novaclient/tests/unit/utils.py
+++ b/novaclient/tests/unit/utils.py
@@ -15,7 +15,7 @@ import os
15 15
16import fixtures 16import fixtures
17import mock 17import mock
18from oslo.serialization import jsonutils 18from oslo_serialization import jsonutils
19import requests 19import requests
20from requests_mock.contrib import fixture as requests_mock_fixture 20from requests_mock.contrib import fixture as requests_mock_fixture
21import six 21import six
diff --git a/novaclient/tests/unit/v2/fakes.py b/novaclient/tests/unit/v2/fakes.py
index 343c421..b36f542 100644
--- a/novaclient/tests/unit/v2/fakes.py
+++ b/novaclient/tests/unit/v2/fakes.py
@@ -17,7 +17,7 @@
17import datetime 17import datetime
18 18
19import mock 19import mock
20from oslo.utils import strutils 20from oslo_utils import strutils
21import six 21import six
22from six.moves.urllib import parse 22from six.moves.urllib import parse
23 23
diff --git a/novaclient/tests/unit/v2/test_servers.py b/novaclient/tests/unit/v2/test_servers.py
index c43aed4..c1a876e 100644
--- a/novaclient/tests/unit/v2/test_servers.py
+++ b/novaclient/tests/unit/v2/test_servers.py
@@ -13,7 +13,7 @@
13# under the License. 13# under the License.
14 14
15import mock 15import mock
16from oslo.serialization import jsonutils 16from oslo_serialization import jsonutils
17import six 17import six
18 18
19from novaclient import exceptions 19from novaclient import exceptions
diff --git a/novaclient/tests/unit/v2/test_shell.py b/novaclient/tests/unit/v2/test_shell.py
index b1b9b80..139ea18 100644
--- a/novaclient/tests/unit/v2/test_shell.py
+++ b/novaclient/tests/unit/v2/test_shell.py
@@ -22,7 +22,7 @@ import os
22 22
23import fixtures 23import fixtures
24import mock 24import mock
25from oslo.utils import timeutils 25from oslo_utils import timeutils
26import six 26import six
27from six.moves import builtins 27from six.moves import builtins
28 28
diff --git a/novaclient/utils.py b/novaclient/utils.py
index 2cf4fc6..50310bf 100644
--- a/novaclient/utils.py
+++ b/novaclient/utils.py
@@ -18,8 +18,8 @@ import textwrap
18import time 18import time
19import uuid 19import uuid
20 20
21from oslo.serialization import jsonutils 21from oslo_serialization import jsonutils
22from oslo.utils import encodeutils 22from oslo_utils import encodeutils
23import pkg_resources 23import pkg_resources
24import prettytable 24import prettytable
25import six 25import six
diff --git a/novaclient/v2/flavors.py b/novaclient/v2/flavors.py
index 54b0f49..1db42e2 100644
--- a/novaclient/v2/flavors.py
+++ b/novaclient/v2/flavors.py
@@ -16,7 +16,7 @@
16Flavor interface. 16Flavor interface.
17""" 17"""
18 18
19from oslo.utils import strutils 19from oslo_utils import strutils
20from six.moves.urllib import parse 20from six.moves.urllib import parse
21 21
22from novaclient import base 22from novaclient import base
diff --git a/novaclient/v2/servers.py b/novaclient/v2/servers.py
index ba576ff..624651b 100644
--- a/novaclient/v2/servers.py
+++ b/novaclient/v2/servers.py
@@ -21,7 +21,7 @@ Server interface.
21 21
22import base64 22import base64
23 23
24from oslo.utils import encodeutils 24from oslo_utils import encodeutils
25import six 25import six
26from six.moves.urllib import parse 26from six.moves.urllib import parse
27 27
diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py
index 33653a1..f609d67 100644
--- a/novaclient/v2/shell.py
+++ b/novaclient/v2/shell.py
@@ -28,9 +28,9 @@ import os
28import sys 28import sys
29import time 29import time
30 30
31from oslo.utils import encodeutils 31from oslo_utils import encodeutils
32from oslo.utils import strutils 32from oslo_utils import strutils
33from oslo.utils import timeutils 33from oslo_utils import timeutils
34import six 34import six
35 35
36from novaclient import client 36from novaclient import client