🐍 Remove is_python_2 func and uses

deknos · Mar 30, 2020 · 0e1dd3f · 0e1dd3f
1 parent 7046220
commit 0e1dd3f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 15 deletions.
diff --git a/detect_secrets/plugins/common/filters.py b/detect_secrets/plugins/common/filters.py
@@ -6,8 +6,6 @@
 import re
 import string
 
-from detect_secrets.util import is_python_2
-
 
 def is_found_with_aho_corasick(secret, automaton):
     """
@@ -22,10 +20,6 @@ def is_found_with_aho_corasick(secret, automaton):
     if not automaton:
         return False
 
-    if is_python_2():  # pragma: no cover
-        # Due to pyahocorasick
-        secret = secret.encode('utf-8')
-
     try:
         # .lower() to make everything case-insensitive
         next(automaton.iter(string=secret.lower()))

diff --git a/detect_secrets/util.py b/detect_secrets/util.py
@@ -1,11 +1,6 @@
 import hashlib
 import os
 import subprocess
-import sys
-
-
-def is_python_2():
-    return sys.version_info[0] < 3
 
 
 def build_automaton(word_list):

diff --git a/tests/plugins/keyword_test.py b/tests/plugins/keyword_test.py
@@ -6,7 +6,6 @@
 
 from detect_secrets.core.potential_secret import PotentialSecret
 from detect_secrets.plugins.keyword import KeywordDetector
-from detect_secrets.util import is_python_2
 from testing.mocks import mock_file_object
 
 
@@ -203,9 +202,6 @@ def test_analyze_standard_positives_with_automaton(self, file_content):
         automaton = ahocorasick.Automaton()
 
         word = 'thisone'
-        if is_python_2():  # pragma: no cover
-            # Due to pyahocorasick
-            word = word.encode('utf-8')
         automaton.add_word(word, word)
 
         automaton.make_automaton()