Drop Python 2 support

[JuanTecedor]

• Encoding special comment line is still required if there is a shebang as per https://docs.python.org/3/tutorial/interpreter.html#source-code-encoding.
• Changed special comment line (encoding) to # -*- coding: utf-8 -*- form
• Super does not require class name https://peps.python.org/pep-3135/
• Modernize % format strings to f-strings
• Drop from builtins import str as unicode (all text should be unicode https://docs.python.org/3/whatsnew/3.0.html#text-vs-data-instead-of-unicode-vs-8-bit)
• Use with statement instead of raw open
• Drop all sys.version_info checks and branches
• Remove inherit from object (actually this is a prerequisite if we want to make the Worker ABC later)

https://docs.python.org/3/whatsnew/3.0.html

[Kamforka]

Please make sure that leaving r"" won't cause any issues with the regex pattern rendering

[JuanTecedor]

Fairly sure r"{}".format(r) is no-OP equivalent.

Quick test with https://hypothesis.readthedocs.io/en/latest/:

import re
from hypothesis import given, strategies as st
from hypothesis.provisional import domains

regexp = (
    "("
    + "([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|"
    + "([0-9a-fA-F]{1,4}:){1,7}:|"
    + "([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|"
    + "([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|"
    + "([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|"
    + "([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|"
    + "([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|"
    + "[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|"
    + ":((:[0-9a-fA-F]{1,4}){1,7}|:)|"
    + "fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|"
    + "::(ffff(:0{1,4}){0,1}:){0,1}"
    + r"((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}"
    + "(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|"
    + "([0-9a-fA-F]{1,4}:){1,4}:"
    + r"((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}"
    + "(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])"
    + ")"
)
original_regex = re.compile(r"{}".format(regexp))
new_regex = re.compile(regexp)


@given(
    st.text()
    | domains()
    | st.ip_addresses()
    | st.none()
    | st.integers()
    | st.floats()
    | st.binary()
)
def test_regex_refactor(data: str):
    old = original_regex.search(str(data))
    new = new_regex.search(str(data))

    if old is None or new is None:
        assert old == new
    else:
        assert old.group() == new.group()
        assert old.span() == new.span()

$ pytest tests/test_regex.py
test session starts ...
1 passed in 0.21s 

[JuanTecedor]

I also compared the original_regex == new_regex and they are the same 😄

[Kamforka]

Suggested change

	output_path = f"{self.job_directory}/output"
	output_dir = f"{self.job_directory}/output"

[JuanTecedor]

Handled also in 7a1d8cd

[Kamforka]

I think for these kind of syntaxes we can start using os.path.join to be future proof in case of different platforms with different path separators

[JuanTecedor]

Good spot :)

Please check 7a1d8cd