diff --git a/detect_secrets/plugins/common/ini_file_parser.py b/detect_secrets/plugins/common/ini_file_parser.py index 4f74b0b44..5aaec74a6 100644 --- a/detect_secrets/plugins/common/ini_file_parser.py +++ b/detect_secrets/plugins/common/ini_file_parser.py @@ -32,12 +32,7 @@ def __init__(self, file, add_header=False, exclude_lines_regex=None): :param exclude_lines_regex: optional regex for ignored lines. """ self.parser = configparser.ConfigParser() - try: - # Python2.7 compatible - self.parser.optionxform = unicode - except NameError: # pragma: no cover - # Python3 compatible - self.parser.optionxform = str + self.parser.optionxform = str self.exclude_lines_regex = exclude_lines_regex @@ -47,12 +42,7 @@ def __init__(self, file, add_header=False, exclude_lines_regex=None): # like config files, without a section header. content = '[global]\n' + content - try: - # Python2.7 compatible - self.parser.read_string(unicode(content)) - except NameError: # pragma: no cover - # Python3 compatible - self.parser.read_string(content) + self.parser.read_string(content) # Hacky way to keep track of line location file.seek(0) diff --git a/detect_secrets/plugins/jwt.py b/detect_secrets/plugins/jwt.py index 5427874b3..b16ed9083 100644 --- a/detect_secrets/plugins/jwt.py +++ b/detect_secrets/plugins/jwt.py @@ -8,13 +8,6 @@ from .base import classproperty from .base import RegexBasedDetector -try: - # Python 2 - from future_builtins import filter -except ImportError: # pragma: no cover - # Python 3 - pass - class JwtTokenDetector(RegexBasedDetector): """Scans for JWTs.""" diff --git a/testing/mocks.py b/testing/mocks.py index 6597618a8..4ef010eb0 100644 --- a/testing/mocks.py +++ b/testing/mocks.py @@ -138,11 +138,7 @@ def __init__(self): self.clear() def add(self, message, *args, **kwargs): - try: - # For python 2.x compatible - self.message += unicode(message) + '\n' - except NameError: - self.message += str(message) + '\n' + self.message += str(message) + '\n' def clear(self): self.message = ''