mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-25 03:41:25 -07:00
Use dict comprehension in plugins (#8814)
* use dict comprehension in plugins * Apply suggestions from code review * add changelog frag * fix references in changelog frag
This commit is contained in:
parent
593d302f0b
commit
ecc048bc12
24 changed files with 81 additions and 45 deletions
|
@ -43,7 +43,7 @@ def initialize_dialect(dialect, **kwargs):
|
|||
raise DialectNotAvailableError("Dialect '%s' is not supported by your version of python." % dialect)
|
||||
|
||||
# Create a dictionary from only set options
|
||||
dialect_params = dict((k, v) for k, v in kwargs.items() if v is not None)
|
||||
dialect_params = {k: v for k, v in kwargs.items() if v is not None}
|
||||
if dialect_params:
|
||||
try:
|
||||
csv.register_dialect('custom', dialect, **dialect_params)
|
||||
|
|
|
@ -113,7 +113,7 @@ class VarDict(object):
|
|||
self._meta[name] = meta
|
||||
|
||||
def output(self):
|
||||
return dict((k, v) for k, v in self._data.items() if self.meta(k).output)
|
||||
return {k: v for k, v in self._data.items() if self.meta(k).output}
|
||||
|
||||
def diff(self):
|
||||
diff_results = [(k, self.meta(k).diff_result) for k in self._data]
|
||||
|
@ -125,7 +125,7 @@ class VarDict(object):
|
|||
return None
|
||||
|
||||
def facts(self):
|
||||
facts_result = dict((k, v) for k, v in self._data.items() if self._meta[k].fact)
|
||||
facts_result = {k: v for k, v in self._data.items() if self._meta[k].fact}
|
||||
return facts_result if facts_result else None
|
||||
|
||||
def change_vars(self):
|
||||
|
|
|
@ -175,18 +175,18 @@ class VarDict(object):
|
|||
self.__vars__[name] = var
|
||||
|
||||
def output(self, verbosity=0):
|
||||
return dict((n, v.value) for n, v in self.__vars__.items() if v.output and v.is_visible(verbosity))
|
||||
return {n: v.value for n, v in self.__vars__.items() if v.output and v.is_visible(verbosity)}
|
||||
|
||||
def diff(self, verbosity=0):
|
||||
diff_results = [(n, v.diff_result) for n, v in self.__vars__.items() if v.diff_result and v.is_visible(verbosity)]
|
||||
if diff_results:
|
||||
before = dict((n, dr['before']) for n, dr in diff_results)
|
||||
after = dict((n, dr['after']) for n, dr in diff_results)
|
||||
before = {n: dr['before'] for n, dr in diff_results}
|
||||
after = {n: dr['after'] for n, dr in diff_results}
|
||||
return {'before': before, 'after': after}
|
||||
return None
|
||||
|
||||
def facts(self, verbosity=0):
|
||||
facts_result = dict((n, v.value) for n, v in self.__vars__.items() if v.fact and v.is_visible(verbosity))
|
||||
facts_result = {n: v.value for n, v in self.__vars__.items() if v.fact and v.is_visible(verbosity)}
|
||||
return facts_result if facts_result else None
|
||||
|
||||
@property
|
||||
|
@ -194,4 +194,4 @@ class VarDict(object):
|
|||
return any(var.has_changed for var in self.__vars__.values())
|
||||
|
||||
def as_dict(self):
|
||||
return dict((name, var.value) for name, var in self.__vars__.items())
|
||||
return {name: var.value for name, var in self.__vars__.items()}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue