[Libstoragemgmt-devel] [PATCH 1/4] Remove txt_a from _data.py

[Andy Grover]

A more Pythonic way of generating a comma-delimited string of 0 to n
elements is to put them in a list and then ", ".join() them.

However, in the usage in smis.py, it doesn't actually appear the
status_info is actually being added-to more than once, so it's
possible status_info could just be a string that we set to the new value,
but I've kept the code as-is for now.

Signed-off-by: Andy Grover <***@redhat.com>
---
plugin/smispy/smis.py | 18 +++++++-----------
python_binding/lsm/__init__.py | 2 +-
python_binding/lsm/_data.py | 7 -------
3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/plugin/smispy/smis.py b/plugin/smispy/smis.py
index 3ad92f8..b8b7f8a 100644
--- a/plugin/smispy/smis.py
+++ b/plugin/smispy/smis.py
@@ -27,7 +27,7 @@ from pywbem import CIMError

from lsm import (IStorageAreaNetwork, error, uri_parse, LsmError, ErrorNumber,
JobStatus, md5, Pool, Volume, AccessGroup, System,
- Capabilities, Disk, txt_a, VERSION, TargetPort,
+ Capabilities, Disk, VERSION, TargetPort,
search_property)

## Variable Naming scheme:
@@ -3190,7 +3190,7 @@ class Smis(IStorageAreaNetwork):
Return (status, status_info)
"""
status = Disk.STATUS_UNKNOWN
- status_info = ''
+ status_info = []
dmtf_statuses = cim_disk['OperationalStatus']
for dmtf_status in dmtf_statuses:
if dmtf_status in Smis._DMTF_STAUTS_TO_DISK_STATUS.keys():
@@ -3200,10 +3200,8 @@ class Smis(IStorageAreaNetwork):
else:
status |= lsm_status
if dmtf_status in Smis._DMTF_STAUTS_TO_DISK_STATUS_INFO.keys():
- status_info = txt_a(
- status_info,
- Smis._DMTF_STAUTS_TO_DISK_STATUS_INFO[dmtf_status])
- return (status, status_info)
+ status_info.append(Smis._DMTF_STAUTS_TO_DISK_STATUS_INFO[dmtf_status])
+ return (status, ", ",join(status_info))

def _new_disk(self, cim_disk, cim_ext):
"""
@@ -3315,7 +3313,7 @@ class Smis(IStorageAreaNetwork):
Return (status, status_info)
"""
status = Pool.STATUS_UNKNOWN
- status_info = ''
+ status_info = []
dmtf_statuses = cim_pool['OperationalStatus']
for dmtf_status in dmtf_statuses:
if dmtf_status in Smis._DMTF_STAUTS_TO_POOL_STATUS.keys():
@@ -3326,10 +3324,8 @@ class Smis(IStorageAreaNetwork):
else:
status |= lsm_status
if dmtf_status in Smis._DMTF_STAUTS_TO_POOL_STATUS_INFO.keys():
- status_info = txt_a(
- status_info,
- Smis._DMTF_STAUTS_TO_POOL_STATUS_INFO[dmtf_status])
- return (status, status_info)
+ status_info.append(Smis._DMTF_STAUTS_TO_POOL_STATUS_INFO[dmtf_status])
+ return (status, ", ".join(status_info))

def _find_out_bottom_cexts(self, cim_pool_path, pros_list=None):
"""
diff --git a/python_binding/lsm/__init__.py b/python_binding/lsm/__init__.py
index 1887c93..308ad15 100644
--- a/python_binding/lsm/__init__.py
+++ b/python_binding/lsm/__init__.py
@@ -7,7 +7,7 @@ from _common import error, info, LsmError, ErrorLevel, ErrorNumber, \
common_urllib2_error_handler, size_human_2_size_bytes
from _data import (Disk, Volume, Pool, System, FileSystem, FsSnapshot,
NfsExport, BlockRange, AccessGroup, TargetPort,
- Capabilities, txt_a)
+ Capabilities)
from _iplugin import IPlugin, IStorageAreaNetwork, INetworkAttachedStorage, \
INfs

diff --git a/python_binding/lsm/_data.py b/python_binding/lsm/_data.py
index bd06286..56e7fd9 100644
--- a/python_binding/lsm/_data.py
+++ b/python_binding/lsm/_data.py
@@ -27,13 +27,6 @@ from json.decoder import WHITESPACE
from _common import get_class, default_property


-def txt_a(txt, append):
- if len(txt):
- return txt + ',' + append
- else:
- return append
-
-
def get_key(dictionary, value):
keys = [k for k, v in dictionary.items() if v == value]
if len(keys) > 0: