diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py index 3dfdd34dce..db837171ad 100644 --- a/libcloud/compute/drivers/dimensiondata.py +++ b/libcloud/compute/drivers/dimensiondata.py @@ -16,8 +16,6 @@ Dimension Data Driver """ -import sys - from libcloud.utils.py3 import ET, urlencode, basestring, ensure_string from libcloud.utils.xml import findall, findtext, fixxpath from libcloud.compute.base import ( @@ -3940,12 +3938,7 @@ def ex_create_node_uncustomized( if not isinstance(ex_tagid_value_pairs, dict): raise ValueError("ex_tagid_value_pairs must be a dictionary.") - if sys.version_info[0] < 3: - tagid_items = ex_tagid_value_pairs.iteritems() - else: - tagid_items = ex_tagid_value_pairs.items() - - for k, v in tagid_items: + for k, v in ex_tagid_value_pairs.items(): tag_elem = ET.SubElement(server_uncustomized_elm, "tagById") ET.SubElement(tag_elem, "tagKeyId").text = k @@ -3956,12 +3949,7 @@ def ex_create_node_uncustomized( if not isinstance(ex_tagname_value_pairs, dict): raise ValueError("ex_tagname_value_pairs must be a dictionary") - if sys.version_info[0] < 3: - tags_items = ex_tagname_value_pairs.iteritems() - else: - tags_items = ex_tagname_value_pairs.items() - - for k, v in tags_items: + for k, v in ex_tagname_value_pairs.items(): tag_name_elem = ET.SubElement(server_uncustomized_elm, "tag") ET.SubElement(tag_name_elem, "tagKeyName").text = k diff --git a/libcloud/compute/drivers/nttcis.py b/libcloud/compute/drivers/nttcis.py index 554f9b31e2..552ada1f38 100644 --- a/libcloud/compute/drivers/nttcis.py +++ b/libcloud/compute/drivers/nttcis.py @@ -17,7 +17,6 @@ """ import re -import sys from libcloud.utils.py3 import ET, urlencode, basestring, ensure_string from libcloud.utils.xml import findall, findtext, fixxpath @@ -4732,12 +4731,7 @@ def ex_create_node_uncustomized( if not isinstance(ex_tagid_value_pairs, dict): raise ValueError("ex_tagid_value_pairs must be a dictionary.") - if sys.version_info[0] < 3: - tagid_items = ex_tagid_value_pairs.iteritems() - else: - tagid_items = ex_tagid_value_pairs.items() - - for k, v in tagid_items: + for k, v in ex_tagid_value_pairs.items(): tag_elem = ET.SubElement(server_uncustomized_elm, "tagById") ET.SubElement(tag_elem, "tagKeyId").text = k @@ -4748,12 +4742,7 @@ def ex_create_node_uncustomized( if not isinstance(ex_tagname_value_pairs, dict): raise ValueError("ex_tagname_value_pairs must be a dictionary") - if sys.version_info[0] < 3: - tags_items = ex_tagname_value_pairs.iteritems() - else: - tags_items = ex_tagname_value_pairs.items() - - for k, v in tags_items: + for k, v in ex_tagname_value_pairs.items(): tag_name_elem = ET.SubElement(server_uncustomized_elm, "tag") ET.SubElement(tag_name_elem, "tagKeyName").text = k diff --git a/pyproject.toml b/pyproject.toml index 372dffdd57..a0f14af4a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -102,7 +102,7 @@ lint = [ "bandit[toml]==1.9.3; python_version >= '3.10'", "black==26.10.1; python_version >= '3.10' and implementation_name == \"cpython\"", "isort==6.0.1; python_version >= '3.10'", - "pyupgrade==3.3.1", + "pyupgrade==3.21.2", "rstcheck==6.2.5; python_version >= '3.10'", "codespell==2.4.1", "prek>=0.2.17",