2to3 code refactoring

Author: ashah-splunk

splunklib/client.py

@@ -977,6 +977,7 @@ def _load_atom_entry(self, response):
         elem = _load_atom(response, XNAME_ENTRY)
         if isinstance(elem, list):
             apps = [ele.entry.content.get('eai:appName') for ele in elem]
+
             raise AmbiguousReferenceException(
                 f"Fetch from server returned multiple entries for name '{elem[0].entry.title}' in apps {apps}.")
         return elem.entry
@@ -2415,8 +2416,9 @@ def _get_kind_list(self, subpath=None):
             if 'create' in [x.rel for x in entry.link]:
                 path = '/'.join(subpath + [entry.title])
                 kinds.append(path)
-            subkinds = self._get_kind_list(subpath + [entry.title])
-            kinds.extend(subkinds)
+            else:
+                subkinds = self._get_kind_list(subpath + [entry.title])
+                kinds.extend(subkinds)
         return kinds
 
     @property
@@ -3761,4 +3763,4 @@ def batch_save(self, *documents):
         data = json.dumps(documents)
 
         return json.loads(
-            self._post('batch_save', headers=KVStoreCollectionData.JSON_HEADER, body=data).body.read().decode('utf-8'))
+            self._post('batch_save', headers=KVStoreCollectionData.JSON_HEADER, body=data).body.read().decode('utf-8'))

splunklib/results.py

@@ -206,10 +206,9 @@ def __init__(self, stream):
     def __iter__(self):
         return self
 
-    def next(self):
+    def __next__(self):
         return next(self._gen)
 
-    __next__ = next
 
     def _parse_results(self, stream):
         """Parse results and messages out of *stream*."""
@@ -318,11 +317,9 @@ def __init__(self, stream):
     def __iter__(self):
         return self
 
-    def next(self):
+    def __next__(self):
         return next(self._gen)
 
-    __next__ = next
-
     def _parse_results(self, stream):
         """Parse results and messages out of *stream*."""
         msg_type = None

splunklib/searchcommands/decorators.py

@@ -191,7 +191,7 @@ def is_supported_by_protocol(version):
 
         if len(values) > 0:
             settings = sorted(list(values.items()))
-            settings = map(lambda n_v: f'{n_v[0]}={n_v[1]}', settings)
+            settings = [f'{n_v[0]}={n_v[1]}' for n_v in settings]
             raise AttributeError('Inapplicable configuration settings: ' + ', '.join(settings))
 
         cls.configuration_setting_definitions = definitions
@@ -416,21 +416,21 @@ def __init__(self, command):
             OrderedDict.__init__(self, ((option.name, item_class(command, option)) for (name, option) in definitions))
 
         def __repr__(self):
-            text = 'Option.View([' + ','.join(map(lambda item: repr(item), self.values())) + '])'
+            text = 'Option.View([' + ','.join([repr(item) for item in list(self.values())]) + '])'
             return text
 
         def __str__(self):
-            text = ' '.join([str(item) for item in self.values() if item.is_set])
+            text = ' '.join([str(item) for item in list(self.values()) if item.is_set])
             return text
 
         # region Methods
 
         def get_missing(self):
-            missing = [item.name for item in self.values() if item.is_required and not item.is_set]
+            missing = [item.name for item in list(self.values()) if item.is_required and not item.is_set]
             return missing if len(missing) > 0 else None
 
         def reset(self):
-            for value in self.values():
+            for value in list(self.values()):
                 value.reset()
 
         # endregion

splunklib/searchcommands/eventing_command.py

@@ -137,7 +137,7 @@ def fix_up(cls, command):
         # N.B.: Does not use Python 2 dict copy semantics
         def iteritems(self):
             iteritems = SearchCommand.ConfigurationSettings.iteritems(self)
-            return map(lambda name_value: (name_value[0], 'events' if name_value[0] == 'type' else name_value[1]), iteritems)
+            return  [(name_value[0], 'events' if name_value[0] == 'type' else name_value[1]) for name_value in iteritems]
 
         # N.B.: Does not use Python 3 dict view semantics
 

splunklib/searchcommands/generating_command.py

@@ -14,7 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from __future__ import absolute_import, division, print_function, unicode_literals
 import sys
 
 from .decorators import ConfigurationSetting
@@ -367,10 +366,9 @@ def iteritems(self):
             iteritems = SearchCommand.ConfigurationSettings.iteritems(self)
             version = self.command.protocol_version
             if version == 2:
-                iteritems = filter(lambda name_value1: name_value1[0] != 'distributed', iteritems)
+                iteritems = [name_value1 for name_value1 in iteritems if name_value1[0] != 'distributed']
                 if not self.distributed and self.type == 'streaming':
-                    iteritems = map(
-                        lambda name_value: (name_value[0], 'stateful') if name_value[0] == 'type' else (name_value[0], name_value[1]), iteritems)
+                    iteritems = [(name_value[0], 'stateful') if name_value[0] == 'type' else (name_value[0], name_value[1]) for name_value in iteritems]
             return iteritems
 
         # N.B.: Does not use Python 3 dict view semantics

splunklib/searchcommands/search_command.py

@@ -290,7 +290,7 @@ def convert_value(value):
             except ValueError:
                 return value
 
-        info = ObjectView(dict(map(lambda f_v: (convert_field(f_v[0]), convert_value(f_v[1])), zip(fields, values))))
+        info = ObjectView(dict((convert_field(f_v[0]), convert_value(f_v[1])) for f_v in zip(fields, values)))
 
         try:
             count_map = info.countMap
@@ -299,15 +299,15 @@ def convert_value(value):
         else:
             count_map = count_map.split(';')
             n = len(count_map)
-            info.countMap = dict(zip(islice(count_map, 0, n, 2), islice(count_map, 1, n, 2)))
+            info.countMap = dict(list(zip(islice(count_map, 0, n, 2), islice(count_map, 1, n, 2))))
 
         try:
             msg_type = info.msgType
             msg_text = info.msg
         except AttributeError:
             pass
         else:
-            messages = filter(lambda t_m: t_m[0] or t_m[1], zip(msg_type.split('\n'), msg_text.split('\n')))
+            messages = [t_m for t_m in zip(msg_type.split('\n'), msg_text.split('\n')) if t_m[0] or t_m[1]]
             info.msg = [Message(message) for message in messages]
             del info.msgType
 
@@ -449,7 +449,7 @@ def _map_metadata(self, argv):
         def _map(metadata_map):
             metadata = {}
 
-            for name, value in metadata_map.items():
+            for name, value in list(metadata_map.items()):
                 if isinstance(value, dict):
                     value = _map(value)
                 else:
@@ -587,7 +587,8 @@ def _process_protocol_v1(self, argv, ifile, ofile):
 
                 ifile = self._prepare_protocol_v1(argv, ifile, ofile)
                 self._record_writer.write_record(dict(
-                    (n, ','.join(v) if isinstance(v, (list, tuple)) else v) for n, v in self._configuration.items()))
+                    (n, ','.join(v) if isinstance(v, (list, tuple)) else v) for n, v in
+                    list(self._configuration.items())))
                 self.finish()
 
             elif argv[1] == '__EXECUTE__':
@@ -937,7 +938,7 @@ def _read_csv_records(self, ifile):
 
         if len(mv_fieldnames) == 0:
             for values in reader:
-                yield OrderedDict(zip(fieldnames, values))
+                yield OrderedDict(list(zip(fieldnames, values)))
             return
 
         for values in reader:
@@ -1019,8 +1020,8 @@ def __repr__(self):
 
             """
             definitions = type(self).configuration_setting_definitions
-            settings = map(
-                lambda setting: repr((setting.name, setting.__get__(self), setting.supporting_protocols)), definitions)
+            settings = [repr((setting.name, setting.__get__(self), setting.supporting_protocols)) for setting in
+                        definitions]
             return '[' + ', '.join(settings) + ']'
 
         def __str__(self):
@@ -1033,7 +1034,7 @@ def __str__(self):
 
             """
             # text = ', '.join(imap(lambda (name, value): name + '=' + json_encode_string(unicode(value)), self.iteritems()))
-            text = ', '.join([f'{name}={json_encode_string(str(value))}' for (name, value) in self.items()])
+            text = ', '.join([f'{name}={json_encode_string(str(value))}' for (name, value) in list(self.items())])
             return text
 
         # region Methods
@@ -1057,10 +1058,10 @@ def fix_up(cls, command_class):
         def iteritems(self):
             definitions = type(self).configuration_setting_definitions
             version = self.command.protocol_version
-            return filter(
-                lambda name_value1: name_value1[1] is not None, map(
-                    lambda setting: (setting.name, setting.__get__(self)), filter(
-                        lambda setting: setting.is_supported_by_protocol(version), definitions)))
+            return [name_value1 for name_value1 in [(setting.name, setting.__get__(self)) for setting in
+                                                    [setting for setting in definitions if
+                                                     setting.is_supported_by_protocol(version)]] if
+                    name_value1[1] is not None]
 
         # N.B.: Does not use Python 3 dict view semantics
 

splunklib/searchcommands/streaming_command.py

@@ -175,12 +175,11 @@ def iteritems(self):
             version = self.command.protocol_version
             if version == 1:
                 if self.required_fields is None:
-                    iteritems = filter(lambda name_value: name_value[0] != 'clear_required_fields', iteritems)
+                    iteritems = [name_value for name_value in iteritems if name_value[0] != 'clear_required_fields']
             else:
-                iteritems = filter(lambda name_value2: name_value2[0] != 'distributed', iteritems)
+                iteritems = [name_value2 for name_value2 in iteritems if name_value2[0] != 'distributed']
                 if not self.distributed:
-                    iteritems = map(
-                        lambda name_value1: (name_value1[0], 'stateful') if name_value1[0] == 'type' else (name_value1[0], name_value1[1]), iteritems)
+                    iteritems = [(name_value1[0], 'stateful') if name_value1[0] == 'type' else (name_value1[0], name_value1[1]) for name_value1 in iteritems]
             return iteritems
 
         # N.B.: Does not use Python 3 dict view semantics