Skip to content

Bump pyupgrade from 3.3.1 to 3.21.2 #2150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
micafer merged 5 commits into from
Nov 8, 2026
Merged

Bump pyupgrade from 3.3.1 to 3.21.2 #2150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2eb5c0d
Bump pyupgrade from 3.3.1 to 3.21.2
dependabot[bot] Jul 6, 2026
9cf5408
Merge branch 'trunk' into dependabot/pip/pyupgrade-3.21.2
micafer Jul 20, 2026
ff5954d
Merge branch 'trunk' into dependabot/pip/pyupgrade-3.21.2
micafer Nov 6, 2026
ad63e3b
Fix code in drivers
micafer Nov 6, 2026
77b7a23
Merge branch 'dependabot/pip/pyupgrade-3.21.2' of github.com:apache/l…
micafer Nov 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions libcloud/compute/drivers/dimensiondata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down
15 changes: 2 additions & 13 deletions libcloud/compute/drivers/nttcis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading