From 6396e9620aad4d2f4038ebe639b39bbc45cec623 Mon Sep 17 00:00:00 2001 From: Rahul Gupta Date: Mon, 30 Aug 2021 17:34:54 +0530 Subject: [PATCH 1/2] fix get children deprecate issue with python 3.9 Signed-off-by: Rahul Gupta --- ucsmsdk/ucscore.py | 2 +- ucsmsdk/ucsmethod.py | 2 +- ucsmsdk/ucsmo.py | 4 ++-- ucsmsdk/utils/convertfrombackup.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ucsmsdk/ucscore.py b/ucsmsdk/ucscore.py index f43ecae7..c5af6a02 100644 --- a/ucsmsdk/ucscore.py +++ b/ucsmsdk/ucscore.py @@ -191,7 +191,7 @@ def from_xml(self, elem, handle=None): self.attr_set(ucsgenutils.convert_to_python_var_name( attr_name), str(attr_value)) - child_elems = elem.getchildren() + child_elems = list(elem) if child_elems: for child_elem in child_elems: if not ET.iselement(child_elem): diff --git a/ucsmsdk/ucsmethod.py b/ucsmsdk/ucsmethod.py index 2ee8e653..b47c8df2 100644 --- a/ucsmsdk/ucsmethod.py +++ b/ucsmsdk/ucsmethod.py @@ -140,7 +140,7 @@ def from_xml(self, elem, handle=None): ExternalMethod._external_method_attrs[attr_name], str(attr_value)) - child_elems = elem.getchildren() + child_elems = list(elem) if child_elems: for child_elem in child_elems: if not ET.iselement(child_elem): diff --git a/ucsmsdk/ucsmo.py b/ucsmsdk/ucsmo.py index 9737fd3f..9a68d297 100644 --- a/ucsmsdk/ucsmo.py +++ b/ucsmsdk/ucsmo.py @@ -408,7 +408,7 @@ def from_xml(self, elem, handle=None): self.__set_prop("rn", os.path.basename(self.dn), forced=True) self.mark_clean() - child_elems = elem.getchildren() + child_elems = list(elem) if child_elems: for child_elem in child_elems: if not ET.iselement(child_elem): @@ -624,7 +624,7 @@ def from_xml(self, elem, handle=None): # else: # raise ValueError("Both rn and dn does not present.") - children = elem.getchildren() + children = list(elem) if children: for child in children: if not ET.iselement(child): diff --git a/ucsmsdk/utils/convertfrombackup.py b/ucsmsdk/utils/convertfrombackup.py index 31c883f1..8a2a05e4 100755 --- a/ucsmsdk/utils/convertfrombackup.py +++ b/ucsmsdk/utils/convertfrombackup.py @@ -197,7 +197,7 @@ def __str__(self): def _process_child_elem(elem, tag, node, iter_count): call_count = iter_count - for child in elem.getchildren(): + for child in list(elem): if _ignore_elem(child): continue @@ -235,14 +235,14 @@ def _generate_outer_nodes(elem): if elem.tag != "topRoot": return top_nodes - for child in elem.getchildren(): + for child in list(elem): class_id = ucsgenutils.word_u(child.tag) if not ucscoreutils.is_valid_class_id(class_id) \ or class_id not in classid_dn_map: continue parent_nodes = [] - for sub_child in child.getchildren(): + for sub_child in list(child): if _ignore_elem(sub_child): continue From ed9d92b82d5987523ec9ca15feca47dc1f11baf0 Mon Sep 17 00:00:00 2001 From: Rahul Gupta Date: Mon, 30 Aug 2021 17:52:31 +0530 Subject: [PATCH 2/2] bumpup version 0.9.12 Signed-off-by: Rahul Gupta --- HISTORY.rst | 5 +++++ setup.cfg | 2 +- setup.py | 2 +- ucsmsdk/__init__.py | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 3359d0dd..667d9ffb 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,11 @@ History ------- +0.9.12 (2021-08-30) +--------------------- +* Fixes for python 3.9 compatibility +* Fixes issue in earlier release + 0.9.11 (2021-08-25) --------------------- * Support for UCSM release 4.2(1a) diff --git a/setup.cfg b/setup.cfg index 801d09e2..085a1be7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.9.11 +current_version = 0.9.12 commit = False tag = False diff --git a/setup.py b/setup.py index 46de5211..c8c21848 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='ucsmsdk', - version='0.9.11', + version='0.9.12', description="Python SDK for Cisco UCS", long_description=readme + '\n\n' + history, long_description_content_type='text/markdown', diff --git a/ucsmsdk/__init__.py b/ucsmsdk/__init__.py index e4134668..7ab0ed3d 100755 --- a/ucsmsdk/__init__.py +++ b/ucsmsdk/__init__.py @@ -34,4 +34,4 @@ __author__ = 'Cisco Systems Inc' __email__ = 'ucs-python@cisco.com' -__version__ = '0.9.11' +__version__ = '0.9.12'