2to3 suggested changes

Author: ashah-splunk

tests/searchcommands/test_decorators.py

@@ -356,9 +356,9 @@ def test_option(self):
 
         options.reset()
         missing = options.get_missing()
-        self.assertListEqual(missing, [option.name for option in options.values() if option.is_required])
-        self.assertListEqual(presets, [str(option) for option in options.values() if option.value is not None])
-        self.assertListEqual(presets, [str(option) for option in options.values() if str(option) != option.name + '=None'])
+        self.assertListEqual(missing, [option.name for option in list(options.values()) if option.is_required])
+        self.assertListEqual(presets, [str(option) for option in list(options.values()) if option.value is not None])
+        self.assertListEqual(presets, [str(option) for option in list(options.values()) if str(option) != option.name + '=None'])
 
         test_option_values = {
             validators.Boolean: ('0', 'non-boolean value'),
@@ -375,7 +375,7 @@ def test_option(self):
             validators.RegularExpression: ('\\s+', '(poorly formed regular expression'),
             validators.Set: ('bar', 'non-existent set entry')}
 
-        for option in options.values():
+        for option in list(options.values()):
             validator = option.validator
 
             if validator is None:
@@ -434,9 +434,9 @@ def test_option(self):
         self.maxDiff = None
 
         tuplewrap = lambda x: x if isinstance(x, tuple) else (x,)
-        invert = lambda x: {v: k for k, v in x.items()}
+        invert = lambda x: {v: k for k, v in list(x.items())}
 
-        for x in command.options.values():
+        for x in list(command.options.values()):
             # isinstance doesn't work for some reason
             if type(x.value).__name__ == 'Code':
                 self.assertEqual(expected[x.name], x.value.source)

tests/searchcommands/test_internals_v1.py

@@ -55,7 +55,7 @@ def fix_up(cls, command_class): pass
         command = TestCommandLineParserCommand()
         CommandLineParser.parse(command, options)
 
-        for option in command.options.values():
+        for option in list(command.options.values()):
             if option.name in ['logging_configuration', 'logging_level', 'record', 'show_configuration']:
                 self.assertFalse(option.is_set)
                 continue
@@ -72,7 +72,7 @@ def fix_up(cls, command_class): pass
         command = TestCommandLineParserCommand()
         CommandLineParser.parse(command, options + fieldnames)
 
-        for option in command.options.values():
+        for option in list(command.options.values()):
             if option.name in ['logging_configuration', 'logging_level', 'record', 'show_configuration']:
                 self.assertFalse(option.is_set)
                 continue
@@ -87,7 +87,7 @@ def fix_up(cls, command_class): pass
         command = TestCommandLineParserCommand()
         CommandLineParser.parse(command, ['required_option=true'] + fieldnames)
 
-        for option in command.options.values():
+        for option in list(command.options.values()):
             if option.name in ['unnecessary_option', 'logging_configuration', 'logging_level', 'record',
                                'show_configuration']:
                 self.assertFalse(option.is_set)
@@ -282,7 +282,7 @@ def test_input_header(self):
             'sentence': 'hello world!'}
 
         input_header = InputHeader()
-        text = reduce(lambda value, item: value + f'{item[0]}:{item[1]}\n', collection.items(), '') + '\n'
+        text = reduce(lambda value, item: value + f'{item[0]}:{item[1]}\n', list(collection.items()), '') + '\n'
 
         with closing(StringIO(text)) as input_file:
             input_header.read(input_file)

tests/searchcommands/test_internals_v2.py

@@ -205,7 +205,7 @@ def test_record_writer_with_random_data(self, save_recording=False):
 
         test_data['metrics'] = metrics
 
-        for name, metric in metrics.items():
+        for name, metric in list(metrics.items()):
             writer.write_metric(name, metric)
 
         self.assertEqual(writer._chunk_count, 0)
@@ -220,8 +220,8 @@ def test_record_writer_with_random_data(self, save_recording=False):
         self.assertListEqual(writer._inspector['messages'], messages)
 
         self.assertDictEqual(
-            dict(k_v for k_v in writer._inspector.items() if k_v[0].startswith('metric.')),
-            dict(('metric.' + k_v1[0], k_v1[1]) for k_v1 in metrics.items()))
+            dict(k_v for k_v in list(writer._inspector.items()) if k_v[0].startswith('metric.')),
+            dict(('metric.' + k_v1[0], k_v1[1]) for k_v1 in list(metrics.items())))
 
         writer.flush(finished=True)
 

tests/test_conf.py

@@ -87,7 +87,7 @@ def test_confs(self):
                   testlib.tmpname(): testlib.tmpname()}
         stanza.submit(values)
         stanza.refresh()
-        for key, value in values.items():
+        for key, value in list(values.items()):
             self.assertTrue(key in stanza)
             self.assertEqual(value, stanza[key])
 

tests/test_input.py

@@ -200,7 +200,7 @@ def setUp(self):
 
     def tearDown(self):
         super().tearDown()
-        for entity in self._test_entities.values():
+        for entity in list(self._test_entities.values()):
             try:
                 self.service.inputs.delete(
                     kind=entity.kind,
@@ -231,7 +231,7 @@ def test_lists_modular_inputs(self):
 
     def test_create(self):
         inputs = self.service.inputs
-        for entity in self._test_entities.values():
+        for entity in list(self._test_entities.values()):
             self.check_entity(entity)
             self.assertTrue(isinstance(entity, client.Input))
 
@@ -242,7 +242,7 @@ def test_get_kind_list(self):
 
     def test_read(self):
         inputs = self.service.inputs
-        for this_entity in self._test_entities.values():
+        for this_entity in list(self._test_entities.values()):
             kind, name = this_entity.kind, this_entity.name
             read_entity = inputs[name, kind]
             self.assertEqual(this_entity.kind, read_entity.kind)
@@ -258,7 +258,7 @@ def test_read_indiviually(self):
 
     def test_update(self):
         inputs = self.service.inputs
-        for entity in self._test_entities.values():
+        for entity in list(self._test_entities.values()):
             kind, name = entity.kind, entity.name
             kwargs = {'host': 'foo'}
             entity.update(**kwargs)
@@ -269,7 +269,7 @@ def test_update(self):
     def test_delete(self):
         inputs = self.service.inputs
         remaining = len(self._test_entities) - 1
-        for input_entity in self._test_entities.values():
+        for input_entity in list(self._test_entities.values()):
             name = input_entity.name
             kind = input_entity.kind
             self.assertTrue(name in inputs)

utils/__init__.py

@@ -14,7 +14,6 @@
 
 """Utility module shared by the SDK unit tests."""
 
-from __future__ import absolute_import
 from utils.cmdopts import *
 
 
@@ -96,7 +95,7 @@ def dslice(value, *args):
     result = {}
     for arg in args:
         if isinstance(arg, dict):
-            for k, v in (arg.items()):
+            for k, v in (list(arg.items())):
                 if k in value:
                     result[v] = value[k]
         elif isinstance(arg, list):