openstack/python-cinderclient
Code Issues Proposed changes

Use oslo_utils encodeutils and strutils

Browse Source 
With oslo-incubator being deprecated, move
our use of strutils to oslo_utils.

This leaves in place the use of oslo-incubator's
strutils by other oslo-incubator modules for now.

Change-Id: Ic4e50060b42aeca9d1e54424a8a3a123140fbf2a
This commit is contained in:
Eric Harney
2015-11-23 10:40:05 -05:00
parent e2a64f361d
commit 6fe9f20663
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cinderclient/client.py
View File

@@ -32,8 +32,8 @@ import requests
from cinderclient import exceptions from cinderclient import exceptions
from cinderclient.openstack.common import importutils from cinderclient.openstack.common import importutils
from cinderclient.openstack.common import strutils
from cinderclient.openstack.common.gettextutils import _ from cinderclient.openstack.common.gettextutils import _
from oslo_utils import strutils
osprofiler_web = importutils.try_import("osprofiler.web") osprofiler_web = importutils.try_import("osprofiler.web")

5
cinderclient/shell.py
View File

@@ -38,7 +38,6 @@ from cinderclient import utils
import cinderclient.auth_plugin import cinderclient.auth_plugin
import cinderclient.extension import cinderclient.extension
from cinderclient.openstack.common import importutils from cinderclient.openstack.common import importutils
from cinderclient.openstack.common import strutils
from cinderclient.openstack.common.gettextutils import _ from cinderclient.openstack.common.gettextutils import _
from cinderclient.v1 import shell as shell_v1 from cinderclient.v1 import shell as shell_v1
from cinderclient.v2 import shell as shell_v2 from cinderclient.v2 import shell as shell_v2
@@ -49,6 +48,8 @@ from keystoneclient.auth.identity import v2 as v2_auth
from keystoneclient.auth.identity import v3 as v3_auth from keystoneclient.auth.identity import v3 as v3_auth
from keystoneclient.exceptions import DiscoveryFailure from keystoneclient.exceptions import DiscoveryFailure
import six.moves.urllib.parse as urlparse import six.moves.urllib.parse as urlparse
from oslo_utils import encodeutils
from oslo_utils import strutils
osprofiler_profiler = importutils.try_import("osprofiler.profiler") osprofiler_profiler = importutils.try_import("osprofiler.profiler")
@@ -902,7 +903,7 @@ def main():
if sys.version_info >= (3, 0): if sys.version_info >= (3, 0):
OpenStackCinderShell().main(sys.argv[1:]) OpenStackCinderShell().main(sys.argv[1:])
else: else:
OpenStackCinderShell().main(map(strutils.safe_decode, OpenStackCinderShell().main(map(encodeutils.safe_decode,
sys.argv[1:])) sys.argv[1:]))
except KeyboardInterrupt: except KeyboardInterrupt:
print("... terminating cinder client", file=sys.stderr) print("... terminating cinder client", file=sys.stderr)

6
cinderclient/utils.py
View File

@@ -24,7 +24,7 @@ import six
import prettytable import prettytable
from cinderclient import exceptions from cinderclient import exceptions
from cinderclient.openstack.common import strutils from oslo_utils import encodeutils
def arg(*args, **kwargs): def arg(*args, **kwargs):
@@ -107,7 +107,7 @@ def _print(pt, order):
if sys.version_info >= (3, 0): if sys.version_info >= (3, 0):
print(pt.get_string(sortby=order)) print(pt.get_string(sortby=order))
else: else:
print(strutils.safe_encode(pt.get_string(sortby=order))) print(encodeutils.safe_encode(pt.get_string(sortby=order)))
def print_list(objs, fields, exclude_unavailable=False, formatters=None, def print_list(objs, fields, exclude_unavailable=False, formatters=None,
@@ -198,7 +198,7 @@ def find_resource(manager, name_or_id):
pass pass
if sys.version_info <= (3, 0): if sys.version_info <= (3, 0):
name_or_id = strutils.safe_decode(name_or_id) name_or_id = encodeutils.safe_decode(name_or_id)
try: try:
try: try:

2
cinderclient/v1/shell.py
View File

@@ -25,9 +25,9 @@ import sys
import time import time
from cinderclient import exceptions from cinderclient import exceptions
from cinderclient.openstack.common import strutils
from cinderclient import utils from cinderclient import utils
from cinderclient.v1 import availability_zones from cinderclient.v1 import availability_zones
from oslo_utils import strutils
def _poll_for_status(poll_fn, obj_id, action, final_ok_states, def _poll_for_status(poll_fn, obj_id, action, final_ok_states,

2
cinderclient/v2/shell.py
View File

@@ -27,8 +27,8 @@ import six
from cinderclient import base from cinderclient import base
from cinderclient import exceptions from cinderclient import exceptions
from cinderclient import utils from cinderclient import utils
from cinderclient.openstack.common import strutils
from cinderclient.v2 import availability_zones from cinderclient.v2 import availability_zones
from oslo_utils import strutils
def _poll_for_status(poll_fn, obj_id, action, final_ok_states, def _poll_for_status(poll_fn, obj_id, action, final_ok_states,

1
requirements.txt
View File

@@ -9,3 +9,4 @@ requests!=2.8.0,>=2.5.2
simplejson>=2.2.0 simplejson>=2.2.0
Babel>=1.3 Babel>=1.3
six>=1.9.0 six>=1.9.0
oslo.utils>=2.8.0 # Apache-2.0