changes

Author: ashah-splunk

tests/test_collection.py

@@ -20,7 +20,6 @@
 from contextlib import contextmanager
 
 from splunklib import client
-from splunklib.six.moves import range
 
 collections = [
     'apps',

tests/test_conf.py

@@ -17,7 +17,6 @@
 from tests import testlib
 
 from splunklib import client
-from splunklib import six
 
 class TestRead(testlib.SDKTestCase):
     def test_read(self):
@@ -88,7 +87,7 @@ def test_confs(self):
                   testlib.tmpname(): testlib.tmpname()}
         stanza.submit(values)
         stanza.refresh()
-        for key, value in six.iteritems(values):
+        for key, value in values.items():
             self.assertTrue(key in stanza)
             self.assertEqual(value, stanza[key])
 

tests/test_input.py

@@ -18,7 +18,7 @@
 from splunklib.binding import HTTPError
 
 from tests import testlib
-from splunklib import six, client
+from splunklib import client
 
 
 
@@ -200,7 +200,7 @@ def setUp(self):
 
     def tearDown(self):
         super().tearDown()
-        for entity in six.itervalues(self._test_entities):
+        for entity in 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 six.itervalues(self._test_entities):
+        for entity in 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 six.itervalues(self._test_entities):
+        for this_entity in 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 six.itervalues(self._test_entities):
+        for entity in 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 six.itervalues(self._test_entities):
+        for input_entity in self._test_entities.values():
             name = input_entity.name
             kind = input_entity.kind
             self.assertTrue(name in inputs)

tests/test_kvstore_batch.py

@@ -15,7 +15,6 @@
 # under the License.
 
 from tests import testlib
-from splunklib.six.moves import range
 
 from splunklib import client
 
@@ -26,7 +25,7 @@ def setUp(self):
         # self.service.namespace['owner'] = 'nobody'
         self.service.namespace['app'] = 'search'
         confs = self.service.kvstore
-        if ('test' in confs):
+        if 'test' in confs:
             confs['test'].delete()
         confs.create('test')
 

tests/test_kvstore_data.py

@@ -16,7 +16,6 @@
 
 import json
 from tests import testlib
-from splunklib.six.moves import range
 
 from splunklib import client
 

tests/test_results.py

@@ -16,7 +16,6 @@
 
 from io import BytesIO
 
-from splunklib.six import StringIO
 from tests import testlib
 from time import sleep
 from splunklib import results

tests/test_saved_search.py

@@ -21,7 +21,6 @@
 from time import sleep
 
 from splunklib import client
-from splunklib.six.moves import zip
 
 import pytest
 

tests/test_service.py

@@ -14,8 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from tests import testlib
 import unittest
+from tests import testlib
 
 from splunklib import client
 from splunklib.binding import AuthenticationError
@@ -56,7 +56,7 @@ def test_info_with_namespace(self):
         try:
             self.assertEqual(self.service.info.licenseState, 'OK')
         except HTTPError as he:
-            self.fail("Couldn't get the server info, probably got a 403! %s" % he.message)
+            self.fail(f"Couldn't get the server info, probably got a 403! {he.message}")
 
         self.service.namespace["owner"] = owner
         self.service.namespace["app"] = app
@@ -186,7 +186,7 @@ def setUp(self):
 
         def assertIsNotNone(self, obj, msg=None):
             if obj is None:
-                raise self.failureException(msg or '%r is not None' % obj)
+                raise self.failureException(msg or f'{obj} is not None')
 
     def test_login_and_store_cookie(self):
         self.assertIsNotNone(self.service.get_cookies())
@@ -363,5 +363,5 @@ def test_proper_namespace_with_service_namespace(self):
 
 
 if __name__ == "__main__":
-    import unittest
+
     unittest.main()

tests/test_storage_passwords.py

@@ -15,7 +15,6 @@
 # under the License.
 
 from tests import testlib
-import logging
 
 from splunklib import client
 

tests/test_user.py

@@ -15,7 +15,6 @@
 # under the License.
 
 from tests import testlib
-import logging
 
 from splunklib import client