mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-08-26 16:01:43 -07:00
remove extra brackets when params are a given by a comprehension (#10712)
Some checks failed
EOL CI / EOL Sanity (Ⓐ2.16) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py2.7) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py3.11) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py3.6) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/3/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/3/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/3/) (push) Has been cancelled
nox / Run extra sanity tests (push) Has been cancelled
Some checks failed
EOL CI / EOL Sanity (Ⓐ2.16) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py2.7) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py3.11) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py3.6) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/3/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/3/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/3/) (push) Has been cancelled
nox / Run extra sanity tests (push) Has been cancelled
* remove extra brackets when function params are a given by a comprehension * add changelog frag
This commit is contained in:
parent
62fa3e6f2b
commit
cb84fa740a
8 changed files with 16 additions and 9 deletions
7
changelogs/fragments/10712-python-idioms-2.yml
Normal file
7
changelogs/fragments/10712-python-idioms-2.yml
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
minor_changes:
|
||||||
|
- iocage inventory plugin - minor refactor to improve readability (https://github.com/ansible-collections/community.general/pull/10712).
|
||||||
|
- manageiq - minor refactor to improve readability (https://github.com/ansible-collections/community.general/pull/10712).
|
||||||
|
- android_sdk - minor refactor to improve readability (https://github.com/ansible-collections/community.general/pull/10712).
|
||||||
|
- elasticsearch_plugin - minor refactor to improve readability (https://github.com/ansible-collections/community.general/pull/10712).
|
||||||
|
- manageiq_alert_profiles - minor refactor to improve readability (https://github.com/ansible-collections/community.general/pull/10712).
|
||||||
|
- one_vm - minor refactor to improve readability (https://github.com/ansible-collections/community.general/pull/10712).
|
|
@ -404,7 +404,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
|
||||||
results['_meta']['hostvars'][iocage_name]['iocage_basejail'] = jail[9]
|
results['_meta']['hostvars'][iocage_name]['iocage_basejail'] = jail[9]
|
||||||
|
|
||||||
def get_properties(self, t_stdout, results, hostname):
|
def get_properties(self, t_stdout, results, hostname):
|
||||||
properties = dict([x.split(':', 1) for x in t_stdout.splitlines()])
|
properties = dict(x.split(':', 1) for x in t_stdout.splitlines())
|
||||||
results['_meta']['hostvars'][hostname]['iocage_properties'] = properties
|
results['_meta']['hostvars'][hostname]['iocage_properties'] = properties
|
||||||
|
|
||||||
def populate(self, results):
|
def populate(self, results):
|
||||||
|
|
|
@ -297,7 +297,7 @@ class ManageIQPolicies(object):
|
||||||
|
|
||||||
# make a list of assigned full profile names strings
|
# make a list of assigned full profile names strings
|
||||||
# e.g. ['openscap profile', ...]
|
# e.g. ['openscap profile', ...]
|
||||||
assigned_profiles_set = set([profile['profile_name'] for profile in assigned_profiles])
|
assigned_profiles_set = set(profile['profile_name'] for profile in assigned_profiles)
|
||||||
|
|
||||||
for profile in profiles:
|
for profile in profiles:
|
||||||
assigned = profile.get('name') in assigned_profiles_set
|
assigned = profile.get('name') in assigned_profiles_set
|
||||||
|
@ -424,7 +424,7 @@ class ManageIQTags(object):
|
||||||
|
|
||||||
# make a list of assigned full tag names strings
|
# make a list of assigned full tag names strings
|
||||||
# e.g. ['/managed/environment/prod', ...]
|
# e.g. ['/managed/environment/prod', ...]
|
||||||
assigned_tags_set = set([tag['full_name'] for tag in assigned_tags])
|
assigned_tags_set = set(tag['full_name'] for tag in assigned_tags)
|
||||||
|
|
||||||
for tag in tags:
|
for tag in tags:
|
||||||
assigned = self.full_tag_name(tag) in assigned_tags_set
|
assigned = self.full_tag_name(tag) in assigned_tags_set
|
||||||
|
|
|
@ -160,7 +160,7 @@ class AndroidSdk(StateModuleHelper):
|
||||||
arg_pkgs = set(self.vars.package)
|
arg_pkgs = set(self.vars.package)
|
||||||
if len(arg_pkgs) < len(self.vars.package):
|
if len(arg_pkgs) < len(self.vars.package):
|
||||||
self.do_raise("Packages may not repeat")
|
self.do_raise("Packages may not repeat")
|
||||||
return set([Package(p) for p in arg_pkgs])
|
return set(Package(p) for p in arg_pkgs)
|
||||||
|
|
||||||
def state_present(self):
|
def state_present(self):
|
||||||
packages = self._parse_packages()
|
packages = self._parse_packages()
|
||||||
|
|
|
@ -238,8 +238,8 @@ def get_plugin_bin(module, plugin_bin=None):
|
||||||
|
|
||||||
# Get separate lists of dirs and binary names from the full paths to the
|
# Get separate lists of dirs and binary names from the full paths to the
|
||||||
# plugin binaries.
|
# plugin binaries.
|
||||||
plugin_dirs = list(set([os.path.dirname(x) for x in bin_paths]))
|
plugin_dirs = list(set(os.path.dirname(x) for x in bin_paths))
|
||||||
plugin_bins = list(set([os.path.basename(x) for x in bin_paths]))
|
plugin_bins = list(set(os.path.basename(x) for x in bin_paths))
|
||||||
|
|
||||||
# Check for the binary names in the default system paths as well as the path
|
# Check for the binary names in the default system paths as well as the path
|
||||||
# specified in the module arguments.
|
# specified in the module arguments.
|
||||||
|
|
|
@ -201,7 +201,7 @@ class ManageIQAlertProfiles(object):
|
||||||
# alert which currently exist in the profile
|
# alert which currently exist in the profile
|
||||||
if 'alert_definitions' in old_profile:
|
if 'alert_definitions' in old_profile:
|
||||||
# we use get_alert_href to have a direct href to the alert
|
# we use get_alert_href to have a direct href to the alert
|
||||||
existing_alerts = set([self.get_alert_href(alert) for alert in old_profile['alert_definitions']])
|
existing_alerts = set(self.get_alert_href(alert) for alert in old_profile['alert_definitions'])
|
||||||
else:
|
else:
|
||||||
# no alerts in this profile
|
# no alerts in this profile
|
||||||
existing_alerts = set()
|
existing_alerts = set()
|
||||||
|
|
|
@ -1146,7 +1146,7 @@ def create_count_of_vms(module, client,
|
||||||
base_name = vm_name[:len(vm_name) - num_sign_cnt]
|
base_name = vm_name[:len(vm_name) - num_sign_cnt]
|
||||||
vm_name = base_name
|
vm_name = base_name
|
||||||
# Make list which contains used indexes in format ['000', '001',...]
|
# Make list which contains used indexes in format ['000', '001',...]
|
||||||
vm_filled_indexes_list = list((vm.NAME[len(base_name):].zfill(num_sign_cnt)) for vm in vm_list)
|
vm_filled_indexes_list = [vm.NAME[len(base_name):].zfill(num_sign_cnt) for vm in vm_list]
|
||||||
|
|
||||||
while count > 0:
|
while count > 0:
|
||||||
new_vm_name = vm_name
|
new_vm_name = vm_name
|
||||||
|
|
|
@ -316,7 +316,7 @@ keyed_groups:
|
||||||
# note the vm_pool (and json data file) has four hosts,
|
# note the vm_pool (and json data file) has four hosts,
|
||||||
# but the options above asks ansible to filter one out
|
# but the options above asks ansible to filter one out
|
||||||
assert len(get_vm_pool_json().VM) == 4
|
assert len(get_vm_pool_json().VM) == 4
|
||||||
assert set([vm.NAME for vm in get_vm_pool_json().VM]) == set([
|
assert set(vm.NAME for vm in get_vm_pool_json().VM) == set([
|
||||||
'terraform_demo_00',
|
'terraform_demo_00',
|
||||||
'terraform_demo_01',
|
'terraform_demo_01',
|
||||||
'terraform_demo_srv_00',
|
'terraform_demo_srv_00',
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue