Fix CI error reported by ansible-lint (ansible-collections#900)

Co-authored-by: Douglas J Hunley <doug.hunley@gmail.com>

Author: Perdu

plugins/modules/postgresql_copy.py

@@ -181,7 +181,6 @@
 '''
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import iteritems
 from ansible_collections.community.postgresql.plugins.module_utils.database import (
     check_input,
     pg_quote_identifier,
@@ -296,11 +295,11 @@ def copy_to(self):
 
     def __transform_options(self):
         """Transform options dict into a suitable string."""
-        for (key, val) in iteritems(self.module.params['options']):
+        for (key, val) in self.module.params['options'].items():
             if key.upper() in self.opt_need_quotes:
                 self.module.params['options'][key] = "'%s'" % val
 
-        opt = ['%s %s' % (key, val) for (key, val) in iteritems(self.module.params['options'])]
+        opt = ['%s %s' % (key, val) for (key, val) in self.module.params['options'].items()]
         return '(%s)' % ', '.join(opt)
 
     def __check_table(self, table):
@@ -365,7 +364,7 @@ def main():
         # Check input for potentially dangerous elements:
         opt_list = None
         if module.params['options']:
-            opt_list = ['%s %s' % (key, val) for (key, val) in iteritems(module.params['options'])]
+            opt_list = ['%s %s' % (key, val) for (key, val) in module.params['options'].items()]
 
         check_input(module,
                     module.params['copy_to'],

plugins/modules/postgresql_info.py

@@ -156,7 +156,6 @@
 
 from ansible.module_utils.common.text.converters import to_native
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import iteritems
 from ansible_collections.community.postgresql.plugins.module_utils.database import \
     check_input
 from ansible_collections.community.postgresql.plugins.module_utils.postgres import (
@@ -317,7 +316,7 @@ def get_pub_info(self):
             if not publications.get(elem['pubname']):
                 publications[elem['pubname']] = {}
 
-            for key, val in iteritems(elem):
+            for key, val in elem.items():
                 if key != 'pubname':
                     publications[elem['pubname']][key] = val
 
@@ -355,7 +354,7 @@ def get_subscr_info(self):
             if not subscr_info[elem['dbname']].get(elem['subname']):
                 subscr_info[elem['dbname']][elem['subname']] = {}
 
-                for key, val in iteritems(elem):
+                for key, val in elem.items():
                     if key not in ('subname', 'dbname'):
                         subscr_info[elem['dbname']][elem['subname']][key] = val
 

plugins/modules/postgresql_publication.py

@@ -254,7 +254,6 @@
 
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import iteritems
 from ansible_collections.community.postgresql.plugins.module_utils.database import (
     check_input, pg_quote_identifier)
 from ansible_collections.community.postgresql.plugins.module_utils.postgres import (
@@ -328,7 +327,7 @@ def transform_rowfilters_keys(rowfilters):
         rowfilters (dict): Changed dict.
     """
     revmap_filters = {}
-    for table, fltr in iteritems(rowfilters):
+    for table, fltr in rowfilters.items():
         fltr = fltr.strip()
         if fltr:
             if fltr[:5].lower() == 'where':
@@ -521,7 +520,7 @@ def create(self, tables, tables_in_schema, columns, rowfilters, params, owner, c
         if params:
             params_list = []
             # Make list ["param = 'value'", ...] from params dict:
-            for (key, val) in iteritems(params):
+            for (key, val) in params.items():
                 params_list.append("%s = '%s'" % (key, val))
 
             # Add the list to query_fragments:
@@ -634,7 +633,7 @@ def update(self, tables, tables_in_schema, columns, rowfilters, params, owner, c
 
         # Update pub parameters:
         if params:
-            for key, val in iteritems(params):
+            for key, val in params.items():
                 if self.attrs['parameters'].get(key):
 
                     # In PostgreSQL 10/11 only 'publish' optional parameter is presented.
@@ -875,7 +874,7 @@ def __pub_set_columns(self, columns_map, rowfilters, check_mode=False):
             True if successful, False otherwise.
         """
         table_list = []
-        for table, columns in iteritems(columns_map):
+        for table, columns in columns_map.items():
             quoted_cols = pg_quote_column_list(table, columns)
             if table in rowfilters:
                 quoted_cols += (" WHERE %s" % rowfilters[table])
@@ -1035,7 +1034,7 @@ def main():
         if not params:
             params_list = None
         else:
-            params_list = ['%s = %s' % (k, v) for k, v in iteritems(params)]
+            params_list = ['%s = %s' % (k, v) for k, v in params.items()]
 
         check_input(module, name, tables, owner,
                     session_role, params_list, comment)

plugins/modules/postgresql_query.py

@@ -266,7 +266,6 @@
 
 from ansible.module_utils.common.text.converters import to_native
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import iteritems
 from ansible_collections.community.postgresql.plugins.module_utils.database import \
     check_input
 from ansible_collections.community.postgresql.plugins.module_utils.postgres import (
@@ -419,7 +418,7 @@ def main():
                     # Ansible engine does not support decimals.
                     # An explicit conversion is required on the module's side
                     row = dict(row)
-                    for (key, val) in iteritems(row):
+                    for (key, val) in row.items():
                         if isinstance(val, TYPES_NEED_TO_CONVERT):
                             row[key] = convert_to_supported(val)
 

plugins/modules/postgresql_script.py

@@ -216,7 +216,6 @@
 
 from ansible.module_utils.common.text.converters import to_native
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import iteritems
 from ansible_collections.community.postgresql.plugins.module_utils.database import \
     check_input
 from ansible_collections.community.postgresql.plugins.module_utils.postgres import (
@@ -339,7 +338,7 @@ def main():
             # Ansible engine does not support decimals.
             # An explicit conversion is required on the module's side
             row = dict(row)
-            for (key, val) in iteritems(row):
+            for (key, val) in row.items():
                 if isinstance(val, TYPES_NEED_TO_CONVERT):
                     row[key] = convert_to_supported(val)
 

plugins/modules/postgresql_subscription.py

@@ -214,7 +214,6 @@
 from copy import deepcopy
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import iteritems
 from ansible_collections.community.postgresql.plugins.module_utils.database import \
     check_input
 from ansible_collections.community.postgresql.plugins.module_utils.postgres import (
@@ -247,7 +246,7 @@ def convert_conn_params(conn_dict):
         Connection string.
     """
     conn_list = []
-    for (param, val) in iteritems(conn_dict):
+    for (param, val) in conn_dict.items():
         conn_list.append('%s=%s' % (param, val))
 
     return ' '.join(conn_list)
@@ -263,7 +262,7 @@ def convert_subscr_params(params_dict):
         Parameters string.
     """
     params_list = []
-    for (param, val) in iteritems(params_dict):
+    for (param, val) in params_dict.items():
         if val is False:
             val = 'false'
         elif val is True:
@@ -280,7 +279,7 @@ def cast_connparams(connparams_dict):
     Returns:
         Dictionary
     """
-    for (param, val) in iteritems(connparams_dict):
+    for (param, val) in connparams_dict.items():
         try:
             connparams_dict[param] = int(val)
         except ValueError:
@@ -423,7 +422,7 @@ def update(self, connparams, publications, subsparams, check_mode=True):
         if subsparams:
             params_to_update = []
 
-            for (param, value) in iteritems(subsparams):
+            for (param, value) in subsparams.items():
                 if param == 'enabled':
                     if self.attrs['enabled'] and value is False:
                         changed = self.enable(enabled=False, check_mode=check_mode)

plugins/modules/postgresql_tablespace.py

@@ -192,7 +192,6 @@
 '''
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import iteritems
 from ansible_collections.community.postgresql.plugins.module_utils.database import \
     check_input
 from ansible_collections.community.postgresql.plugins.module_utils.postgres import (
@@ -455,7 +454,7 @@ def main():
         if not settings:
             settings_list = None
         else:
-            settings_list = ['%s = %s' % (k, v) for k, v in iteritems(settings)]
+            settings_list = ['%s = %s' % (k, v) for k, v in settings.items()]
 
         check_input(module, tablespace, location, owner,
                     rename_to, session_role, settings_list, comment)

plugins/modules/postgresql_user_obj_stat_info.py

@@ -107,7 +107,6 @@
 '''
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import iteritems
 from ansible_collections.community.postgresql.plugins.module_utils.database import \
     check_input
 from ansible_collections.community.postgresql.plugins.module_utils.postgres import (
@@ -252,7 +251,7 @@ def __fill_out_info(self, result, info_key=None, schema_key=None, name_key=None)
             self.info[info_key][elem[schema_key]][elem[name_key]] = {}
 
             # Add other other attributes to a certain index:
-            for key, val in iteritems(elem):
+            for key, val in elem.items():
                 if key not in (schema_key, name_key):
                     self.info[info_key][elem[schema_key]][elem[name_key]][key] = val