Skip to content

Commit 7380fbe

Browse files
stephenfinstephenfin
committed
typing: Add types for empty dicts, tuples
In some cases, simply remove them. Change-Id: I24a311a24eb533325dda83005777bcb2e0afc320 Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent bdd55d9 commit 7380fbe

35 files changed

+67
-93
lines changed

‎openstackclient/common/clientmanager.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import importlib
1919
import logging
2020
import sys
21+
import typing as ty
2122

2223
from osc_lib import clientmanager
2324
from osc_lib import shell
@@ -26,7 +27,7 @@
2627

2728
LOG = logging.getLogger(__name__)
2829

29-
PLUGIN_MODULES = []
30+
PLUGIN_MODULES: list[ty.Any] = []
3031

3132
USER_AGENT = 'python-openstackclient'
3233

‎openstackclient/common/project_cleanup.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import logging
1818
import os
1919
import queue
20+
import typing as ty
2021

2122
from cliff.formatters import table
2223
from osc_lib.command import command
@@ -100,7 +101,7 @@ def take_action(self, parsed_args):
100101
project_connect = sdk.connect_as_project(project)
101102

102103
if project_connect:
103-
status_queue = queue.Queue()
104+
status_queue: queue.Queue[ty.Any] = queue.Queue()
104105
parsed_args.max_width = int(
105106
os.environ.get('CLIFF_MAX_TERM_WIDTH', 0)
106107
)

‎openstackclient/compute/v2/aggregate.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"""Compute v2 Aggregate action implementations"""
1818

1919
import logging
20+
import typing as ty
2021

2122
from openstack import utils as sdk_utils
2223
from osc_lib.cli import format_columns
@@ -321,7 +322,7 @@ def take_action(self, parsed_args):
321322
if kwargs:
322323
compute_client.update_aggregate(aggregate.id, **kwargs)
323324

324-
properties = {}
325+
properties: dict[str, ty.Any] = {}
325326
if parsed_args.no_property:
326327
# NOTE(RuiChen): "availability_zone" can not be unset from
327328
# properties. It is already excluded from show and create output.

‎openstackclient/compute/v2/console.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@
2525
def _get_console_columns(item):
2626
# To maintain backwards compatibility we need to rename sdk props to
2727
# whatever OSC was using before
28-
column_map = {}
2928
hidden_columns = ['id', 'links', 'location', 'name']
3029
return utils.get_osc_show_columns_for_sdk_resource(
31-
item, column_map, hidden_columns
30+
item, {}, hidden_columns
3231
)
3332

3433

‎openstackclient/compute/v2/keypair.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,13 @@ def _generate_keypair():
6161
def _get_keypair_columns(item, hide_pub_key=False, hide_priv_key=False):
6262
# To maintain backwards compatibility we need to rename sdk props to
6363
# whatever OSC was using before
64-
column_map = {}
6564
hidden_columns = ['links', 'location']
6665
if hide_pub_key:
6766
hidden_columns.append('public_key')
6867
if hide_priv_key:
6968
hidden_columns.append('private_key')
7069
return utils.get_osc_show_columns_for_sdk_resource(
71-
item, column_map, hidden_columns
70+
item, {}, hidden_columns
7271
)
7372

7473

‎openstackclient/compute/v2/server.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,6 @@ def __call__(self, parser, namespace, values, option_string=None):
10321032

10331033
class BDMAction(parseractions.MultiKeyValueAction):
10341034
def __init__(self, option_strings, dest, **kwargs):
1035-
required_keys = []
10361035
optional_keys = [
10371036
'uuid',
10381037
'source_type',
@@ -1050,7 +1049,7 @@ def __init__(self, option_strings, dest, **kwargs):
10501049
super().__init__(
10511050
option_strings,
10521051
dest,
1053-
required_keys=required_keys,
1052+
required_keys=[],
10541053
optional_keys=optional_keys,
10551054
**kwargs,
10561055
)
@@ -3963,14 +3962,12 @@ def update_parser_common(self, parser):
39633962
return parser
39643963

39653964
def take_action_network(self, client, parsed_args):
3966-
attrs = {}
39673965
obj = client.find_ip(
39683966
parsed_args.ip_address,
39693967
ignore_missing=False,
39703968
)
3971-
attrs['port_id'] = None
39723969

3973-
client.update_ip(obj, **attrs)
3970+
client.update_ip(obj, port_id=None)
39743971

39753972
def take_action_compute(self, client, parsed_args):
39763973
server = client.find_server(parsed_args.server, ignore_missing=False)

‎openstackclient/compute/v2/server_event.py‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,11 @@ class ServerActionEventColumn(columns.FormattableColumn):
6565
"""
6666

6767
def _format_event(self, event):
68-
column_map = {}
6968
hidden_columns = ['id', 'name', 'location']
7069
_, columns = utils.get_osc_show_columns_for_sdk_resource(
71-
event,
72-
column_map,
73-
hidden_columns,
74-
)
75-
data = utils.get_item_properties(
76-
event,
77-
columns,
70+
event, {}, hidden_columns
7871
)
72+
data = utils.get_item_properties(event, columns)
7973
return dict(zip(columns, data))
8074

8175
def human_readable(self):
@@ -88,17 +82,14 @@ def machine_readable(self):
8882

8983

9084
def _get_server_event_columns(item, client):
91-
column_map = {}
9285
hidden_columns = ['name', 'server_id', 'links', 'location']
9386

9487
if not sdk_utils.supports_microversion(client, '2.58'):
9588
# updated_at was introduced in 2.58
9689
hidden_columns.append('updated_at')
9790

9891
return utils.get_osc_show_columns_for_sdk_resource(
99-
item,
100-
column_map,
101-
hidden_columns,
92+
item, {}, hidden_columns
10293
)
10394

10495

‎openstackclient/image/v2/image.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import logging
2121
import os
2222
import sys
23+
import typing as ty
2324

2425
from cinderclient import api_versions
2526
from openstack import exceptions as sdk_exceptions
@@ -615,7 +616,10 @@ def _take_action_volume(self, parsed_args):
615616
volume_client.volumes,
616617
parsed_args.volume,
617618
)
618-
kwargs = {}
619+
kwargs = {
620+
'visibility': None,
621+
'protected': None,
622+
}
619623
if volume_client.api_version < api_versions.APIVersion('3.1'):
620624
if parsed_args.visibility or parsed_args.is_protected is not None:
621625
msg = _(
@@ -625,10 +629,8 @@ def _take_action_volume(self, parsed_args):
625629
)
626630
raise exceptions.CommandError(msg)
627631
else:
628-
kwargs.update(
629-
visibility=parsed_args.visibility or 'private',
630-
protected=parsed_args.is_protected or False,
631-
)
632+
kwargs['visibility'] = parsed_args.visibility or 'private'
633+
kwargs['protected'] = parsed_args.is_protected or False
632634

633635
response, body = volume_client.volumes.upload_to_image(
634636
source_volume.id,
@@ -1453,7 +1455,6 @@ def take_action(self, parsed_args):
14531455
ignore_missing=False,
14541456
)
14551457

1456-
kwargs = {}
14571458
tagret = 0
14581459
propret = 0
14591460
if parsed_args.tags:
@@ -1466,6 +1467,7 @@ def take_action(self, parsed_args):
14661467
)
14671468
tagret += 1
14681469

1470+
kwargs: dict[str, ty.Any] = {}
14691471
if parsed_args.properties:
14701472
for k in parsed_args.properties:
14711473
if k in image:

‎openstackclient/image/v2/metadef_resource_type_association.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222

2323

2424
def _get_columns(item):
25-
column_map = {}
2625
hidden_columns = ['location']
2726
return utils.get_osc_show_columns_for_sdk_resource(
28-
item, column_map, hidden_columns
27+
item, {}, hidden_columns
2928
)
3029

3130

‎openstackclient/image/v2/metadef_resource_types.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ class ListMetadefResourceTypes(command.Lister):
2323

2424
def take_action(self, parsed_args):
2525
image_client = self.app.client_manager.image
26-
kwargs = {}
27-
data = image_client.metadef_resource_types(**kwargs)
26+
data = image_client.metadef_resource_types()
2827
columns = ['Name']
2928
column_headers = columns
3029
return (

0 commit comments

Comments
 (0)