🐍 Remove unnecessary (object) inheritance

Author: KevinHock

detect_secrets/core/bidirectional_iterator.py

@@ -1,4 +1,4 @@
-class BidirectionalIterator(object):
+class BidirectionalIterator:
     def __init__(self, collection):
         self.collection = collection
         self.index = -1  # Starts on -1, as index is increased _before_ getting result

detect_secrets/core/code_snippet.py

@@ -43,7 +43,7 @@ def get_code_snippet(self, file_lines, line_number, lines_of_context=5):
         )
 
 
-class CodeSnippet(object):
+class CodeSnippet:
 
     def __init__(self, snippet, start_line, target_index):
         """

detect_secrets/core/potential_secret.py

@@ -1,7 +1,7 @@
 import hashlib
 
 
-class PotentialSecret(object):
+class PotentialSecret:
     """This custom data type represents a string found, matching the
     plugin rules defined in SecretsCollection, that has the potential
     to be a secret that we actually care about.

detect_secrets/core/secrets_collection.py

@@ -13,7 +13,7 @@
 from detect_secrets.util import build_automaton
 
 
-class SecretsCollection(object):
+class SecretsCollection:
 
     def __init__(
         self,

detect_secrets/core/usage.py

@@ -42,7 +42,7 @@ def add_no_verify_flag(parser):
     )
 
 
-class ParserBuilder(object):
+class ParserBuilder:
 
     def __init__(self):
         self.parser = argparse.ArgumentParser()
@@ -133,7 +133,7 @@ def _add_no_verify_flag(self):
         return self
 
 
-class ScanOptions(object):
+class ScanOptions:
 
     def __init__(self, subparser):
         self.parser = subparser.add_parser(
@@ -209,7 +209,7 @@ def _add_adhoc_scanning_argument(self):
         )
 
 
-class AuditOptions(object):
+class AuditOptions:
 
     def __init__(self, subparser):
         self.parser = subparser.add_parser(
@@ -320,7 +320,7 @@ def get_disabled_help_text(plugin):
         return 'Disables {}'.format(line)
 
 
-class PluginOptions(object):
+class PluginOptions:
 
     all_plugins = [
         PluginDescriptor.from_plugin_class(plugin, name)

detect_secrets/plugins/base.py

@@ -24,7 +24,7 @@ def __get__(self, cls, owner):
         return classmethod(self.fget).__get__(None, owner)()
 
 
-class BasePlugin(object):
+class BasePlugin:
     """
     This is an abstract class to define Plugins API.
 

detect_secrets/plugins/common/ini_file_parser.py

@@ -17,7 +17,7 @@ def append(self, lineno, line):
 configparser.ParsingError = EfficientParsingError
 
 
-class IniFileParser(object):
+class IniFileParser:
 
     _comment_regex = re.compile(r'\s*[;#]')
 

detect_secrets/plugins/common/yaml_file_parser.py

@@ -3,7 +3,7 @@
 from .constants import ALLOWLIST_REGEX
 
 
-class YamlFileParser(object):
+class YamlFileParser:
     """
     Yaml config files are interesting, because they don't necessarily conform
     to our basic regex for detecting HighEntropyStrings as strings don't

testing/mocks.py

@@ -133,7 +133,7 @@ def mock_printer(obj):
     """
     :type obj: module
     """
-    class PrinterShim(object):
+    class PrinterShim:
         def __init__(self):
             self.clear()
 
@@ -150,7 +150,7 @@ def clear(self):
 
 @contextmanager
 def mock_log(namespace):
-    class MockLogWrapper(object):
+    class MockLogWrapper:
         """This is used to check what is being logged."""
 
         def __init__(self):

tests/core/audit_test.py

@@ -21,7 +21,7 @@ def reset_file_cache():
     audit._open_file_with_cache.cache_clear()
 
 
-class TestAuditBaseline(object):
+class TestAuditBaseline:
 
     def test_no_baseline(self, mock_printer):
         with self.mock_env(baseline='') as m:
@@ -310,7 +310,7 @@ def leapfrog_baseline(self):
         }
 
 
-class TestCompareBaselines(object):
+class TestCompareBaselines:
 
     def test_raises_error_if_comparing_same_file(self):
         with pytest.raises(audit.RedundantComparisonError):
@@ -486,7 +486,7 @@ def new_baseline(self):
         }
 
 
-class TestDetermineAuditResults(object):
+class TestDetermineAuditResults:
 
     @pytest.fixture
     def mock_get_raw_secret_value(self):
@@ -724,7 +724,7 @@ def test_print_audit_results_none(
         assert expected_message in mock_printer.message
 
 
-class TestPrintContext(object):
+class TestPrintContext:
 
     def run_logic(
         self,
@@ -1028,7 +1028,7 @@ def test_unicode_in_output(self, mock_printer):
         """)[1:-1]
 
 
-class TestGetUserDecision(object):
+class TestGetUserDecision:
 
     @pytest.mark.parametrize(
         'user_input, expected_value',
@@ -1086,7 +1086,7 @@ def mock_user_input(inputs):
     :type inputs: list
     :param inputs: list of user choices
     """
-    class InputShim(object):
+    class InputShim:
         def __init__(self):
             self.message = ''
             self.index = 0

tests/core/baseline_test.py

@@ -21,7 +21,7 @@
 from testing.mocks import SubprocessMock
 
 
-class TestInitializeBaseline(object):
+class TestInitializeBaseline:
 
     def setup(self):
         self.plugins = (
@@ -186,7 +186,7 @@ def test_scan_all_files_with_bad_symlinks(self):
         assert len(results.keys()) == 0
 
 
-class TestGetSecretsNotInBaseline(object):
+class TestGetSecretsNotInBaseline:
 
     def test_nothing_new(self):
         # We want a secret, but just a default secret (no overriding parameters)
@@ -292,7 +292,7 @@ def test_rolled_creds(self):
         assert baseline.data == backup_baseline
 
 
-class TestUpdateBaselineWithRemovedSecrets(object):
+class TestUpdateBaselineWithRemovedSecrets:
 
     def test_deleted_secret(self):
         new_findings = secrets_collection_factory([
@@ -393,7 +393,7 @@ def test_no_baseline_modifications(self, results_dict, baseline_dict):
         )
 
 
-class TestMergeBaseline(object):
+class TestMergeBaseline:
 
     def test_copies_is_secret_label_accurately(self):
         assert merge_baseline(
@@ -496,7 +496,7 @@ def test_copies_is_secret_label_accurately(self):
         pass
 
 
-class TestMergeResults(object):
+class TestMergeResults:
 
     def test_new_results_has_nothing(self):
         old_result = {
@@ -620,7 +620,7 @@ def get_secret():
         }
 
 
-class TestFormatBaselineForOutput(object):
+class TestFormatBaselineForOutput:
 
     def test_sorts_by_line_number_then_hash(self):
         output_string = format_baseline_for_output({

tests/core/bidirectional_iterator_test.py

@@ -5,7 +5,7 @@
 from detect_secrets.core import bidirectional_iterator
 
 
-class TestBidirectionalIterator(object):
+class TestBidirectionalIterator:
 
     def test_no_input(self):
         iterator = bidirectional_iterator.BidirectionalIterator([])

tests/core/potential_secret_test.py

@@ -6,7 +6,7 @@
 from testing.factories import potential_secret_factory
 
 
-class TestPotentialSecret(object):
+class TestPotentialSecret:
 
     @pytest.mark.parametrize(
         'a, b, is_equal',

tests/core/secrets_collection_test.py

@@ -41,7 +41,7 @@ def mock_gmtime():
         yield current_time
 
 
-class TestScanFile(object):
+class TestScanFile:
     """Testing file scanning, and interactions with different plugins."""
 
     def test_file_is_symbolic_link(self):
@@ -141,7 +141,7 @@ def test_unicode_decode_error(self, mock_log):
         assert len(logic.data) == 0
 
 
-class TestScanDiff(object):
+class TestScanDiff:
 
     def test_success(self):
         secrets = self.load_from_diff().format_for_baseline_output()['results']
@@ -200,7 +200,7 @@ def load_from_diff(self, existing_secrets=None, baseline_filename='', exclude_fi
         return collection
 
 
-class TestGetSecret(object):
+class TestGetSecret:
     """Testing retrieval of PotentialSecret from SecretsCollection"""
 
     @pytest.mark.parametrize(
@@ -258,7 +258,7 @@ def _mock_secret_hash(self, secret_hash='secret_hash'):
             yield
 
 
-class TestBaselineInputOutput(object):
+class TestBaselineInputOutput:
     """A critical part of the SecretsCollection is the ability to write a baseline, then
     read from that same baseline to recreate state. This test suite checks the functions
     related to that ability.

tests/core/usage_test.py

@@ -6,7 +6,7 @@
 from detect_secrets.plugins.common.util import import_plugins
 
 
-class TestPluginOptions(object):
+class TestPluginOptions:
 
     @staticmethod
     def parse_args(argument_string=''):

tests/main_test.py

@@ -74,7 +74,7 @@ def get_plugin_report(extra=None):
     ) + '\n'
 
 
-class TestMain(object):
+class TestMain:
     """These are smoke tests for the console usage of detect_secrets.
     Most of the functional test cases should be within their own module tests.
     """

tests/plugins/artifactory_test.py

@@ -5,7 +5,7 @@
 from detect_secrets.plugins.artifactory import ArtifactoryDetector
 
 
-class TestArtifactoryDetector(object):
+class TestArtifactoryDetector:
 
     @pytest.mark.parametrize(
         'payload, should_flag',

tests/plugins/aws_key_test.py

@@ -15,7 +15,7 @@
 EXAMPLE_SECRET = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
 
 
-class TestAWSKeyDetector(object):
+class TestAWSKeyDetector:
 
     def setup(self):
         self.example_key = 'AKIAZZZZZZZZZZZZZZZZ'

tests/plugins/basic_auth_test.py

@@ -5,7 +5,7 @@
 from detect_secrets.plugins.basic_auth import BasicAuthDetector
 
 
-class TestBasicAuthDetector(object):
+class TestBasicAuthDetector:
 
     @pytest.mark.parametrize(
         'payload, should_flag',

tests/plugins/cloudant_test.py

@@ -17,7 +17,7 @@
 CL_API_KEY = 'abcdefghijabcdefghijabcd'
 
 
-class TestCloudantDetector(object):
+class TestCloudantDetector:
 
     @pytest.mark.parametrize(
         'payload, should_flag',

tests/plugins/common/filters_test.py

@@ -5,7 +5,7 @@
 from detect_secrets.plugins.common import filters
 
 
-class TestIsSequentialString(object):
+class TestIsSequentialString:
     @pytest.mark.parametrize(
         'secret',
         (
@@ -43,7 +43,7 @@ def test_failure(self, secret):
         assert not filters.is_sequential_string(secret)
 
 
-class TestIsLikelyIdString(object):
+class TestIsLikelyIdString:
     @pytest.mark.parametrize(
         'secret, line',
         [
@@ -75,7 +75,7 @@ def test_failure(self, secret, line):
         assert not filters.is_likely_id_string(secret, line)
 
 
-class TestIsPotentialUuid(object):
+class TestIsPotentialUuid:
     @pytest.mark.parametrize(
         'secret',
         [

tests/plugins/common/initialize_test.py

@@ -8,7 +8,7 @@
 from detect_secrets.plugins.high_entropy_strings import HexHighEntropyString
 
 
-class TestFromPluginClassname(object):
+class TestFromPluginClassname:
 
     def test_success(self):
         plugin = initialize.from_plugin_classname(
@@ -39,7 +39,7 @@ def test_fails_on_bad_initialization(self):
             )
 
 
-class TestFromSecretType(object):
+class TestFromSecretType:
 
     def setup(self):
         self.settings = [

tests/plugins/common/yaml_file_parser_test.py

@@ -8,7 +8,7 @@
 from testing.mocks import mock_file_object
 
 
-class TestYamlFileParser(object):
+class TestYamlFileParser:
 
     def test_get_ignored_lines(self):
         content = """keyA: value

tests/plugins/high_entropy_strings_test.py

@@ -10,7 +10,7 @@
 from testing.mocks import mock_file_object
 
 
-class HighEntropyStringsTest(object):
+class HighEntropyStringsTest:
     """
     Some explaining should be done regarding the "enforced" format of the parametrized
     abstract pytests.