diff --git a/agent/agent.py b/agent/agent.py index 01a74909aca..0290143073a 100644 --- a/agent/agent.py +++ b/agent/agent.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import argparse import cgi import http.server diff --git a/analyzer/linux/analyzer.py b/analyzer/linux/analyzer.py index 8764c80840d..7c06df764c5 100644 --- a/analyzer/linux/analyzer.py +++ b/analyzer/linux/analyzer.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import datetime import logging import os diff --git a/analyzer/linux/lib/api/process.py b/analyzer/linux/lib/api/process.py index 427923042ea..ba20ef05341 100644 --- a/analyzer/linux/lib/api/process.py +++ b/analyzer/linux/lib/api/process.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os import subprocess diff --git a/analyzer/linux/lib/api/screenshot.py b/analyzer/linux/lib/api/screenshot.py index 61d4981ec71..1b14df9a6ef 100644 --- a/analyzer/linux/lib/api/screenshot.py +++ b/analyzer/linux/lib/api/screenshot.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import math diff --git a/analyzer/linux/lib/common/abstracts.py b/analyzer/linux/lib/common/abstracts.py index a80b90e9eae..9a05cf88010 100644 --- a/analyzer/linux/lib/common/abstracts.py +++ b/analyzer/linux/lib/common/abstracts.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - from lib.api.process import Process from lib.common.exceptions import CuckooPackageError diff --git a/analyzer/linux/lib/common/apicalls.py b/analyzer/linux/lib/common/apicalls.py index e703e909d6e..c5002236059 100644 --- a/analyzer/linux/lib/common/apicalls.py +++ b/analyzer/linux/lib/common/apicalls.py @@ -3,7 +3,6 @@ # This software may be modified and distributed under the terms # of the MIT license. See the LICENSE file for details. -from __future__ import absolute_import import logging import os diff --git a/analyzer/linux/lib/common/constants.py b/analyzer/linux/lib/common/constants.py index d0a94a7a21b..a53105de573 100644 --- a/analyzer/linux/lib/common/constants.py +++ b/analyzer/linux/lib/common/constants.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import tempfile diff --git a/analyzer/linux/lib/common/exceptions.py b/analyzer/linux/lib/common/exceptions.py index de5798ee146..863e2d851ef 100644 --- a/analyzer/linux/lib/common/exceptions.py +++ b/analyzer/linux/lib/common/exceptions.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - class CuckooError(Exception): pass diff --git a/analyzer/linux/lib/common/hashing.py b/analyzer/linux/lib/common/hashing.py index 701e7571d0c..203c7ffcfc5 100644 --- a/analyzer/linux/lib/common/hashing.py +++ b/analyzer/linux/lib/common/hashing.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import hashlib BUFSIZE = 1024 * 1024 diff --git a/analyzer/linux/lib/common/rand.py b/analyzer/linux/lib/common/rand.py index 89da3897a65..3eda4357338 100644 --- a/analyzer/linux/lib/common/rand.py +++ b/analyzer/linux/lib/common/rand.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import random import string diff --git a/analyzer/linux/lib/common/results.py b/analyzer/linux/lib/common/results.py index 7946b8f7c09..3809b9bb9c3 100644 --- a/analyzer/linux/lib/common/results.py +++ b/analyzer/linux/lib/common/results.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os import socket diff --git a/analyzer/linux/lib/core/config.py b/analyzer/linux/lib/core/config.py index 57c7f920d2f..03670db1fe0 100644 --- a/analyzer/linux/lib/core/config.py +++ b/analyzer/linux/lib/core/config.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import configparser diff --git a/analyzer/linux/lib/core/packages.py b/analyzer/linux/lib/core/packages.py index 406a131f25a..d6f4e58ca84 100644 --- a/analyzer/linux/lib/core/packages.py +++ b/analyzer/linux/lib/core/packages.py @@ -3,7 +3,6 @@ # This software may be modified and distributed under the terms # of the MIT license. See the LICENSE file for details. -from __future__ import absolute_import import inspect import logging import subprocess diff --git a/analyzer/linux/lib/core/startup.py b/analyzer/linux/lib/core/startup.py index 6623504f4fd..9d957211dfc 100644 --- a/analyzer/linux/lib/core/startup.py +++ b/analyzer/linux/lib/core/startup.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os diff --git a/analyzer/linux/modules/auxiliary/screenshots.py b/analyzer/linux/modules/auxiliary/screenshots.py index cbab145a1dd..45818cdf373 100644 --- a/analyzer/linux/modules/auxiliary/screenshots.py +++ b/analyzer/linux/modules/auxiliary/screenshots.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import time from io import BytesIO diff --git a/analyzer/linux/modules/auxiliary/stap.py b/analyzer/linux/modules/auxiliary/stap.py index bb62e422b57..99ee83e0a28 100644 --- a/analyzer/linux/modules/auxiliary/stap.py +++ b/analyzer/linux/modules/auxiliary/stap.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os import subprocess diff --git a/analyzer/windows/analyzer.py b/analyzer/windows/analyzer.py index dcc53034132..c5aa06109d1 100644 --- a/analyzer/windows/analyzer.py +++ b/analyzer/windows/analyzer.py @@ -4,7 +4,6 @@ # TODO # https://github.com/cuckoosandbox/cuckoo/blob/ad5bf8939fb4b86d03c4d96014b174b8b56885e3/cuckoo/core/plugins.py#L29 -from __future__ import absolute_import import hashlib import logging import os diff --git a/analyzer/windows/lib/api/process.py b/analyzer/windows/lib/api/process.py index 53a5a066aa3..b6dc8cba1d5 100644 --- a/analyzer/windows/lib/api/process.py +++ b/analyzer/windows/lib/api/process.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import base64 import contextlib import logging diff --git a/analyzer/windows/lib/api/screenshot.py b/analyzer/windows/lib/api/screenshot.py index 7ec6875a282..1ff9d749c7b 100644 --- a/analyzer/windows/lib/api/screenshot.py +++ b/analyzer/windows/lib/api/screenshot.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import math diff --git a/analyzer/windows/lib/api/utils.py b/analyzer/windows/lib/api/utils.py index 18f00fa31ea..2555d341998 100644 --- a/analyzer/windows/lib/api/utils.py +++ b/analyzer/windows/lib/api/utils.py @@ -12,7 +12,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import absolute_import import logging import socket import subprocess diff --git a/analyzer/windows/lib/common/abstracts.py b/analyzer/windows/lib/common/abstracts.py index 9e9d8c6c532..14d0b317887 100644 --- a/analyzer/windows/lib/common/abstracts.py +++ b/analyzer/windows/lib/common/abstracts.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import glob import logging import os diff --git a/analyzer/windows/lib/common/common.py b/analyzer/windows/lib/common/common.py index f2cbf78c159..7a86babfea4 100644 --- a/analyzer/windows/lib/common/common.py +++ b/analyzer/windows/lib/common/common.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import logging import os diff --git a/analyzer/windows/lib/common/constants.py b/analyzer/windows/lib/common/constants.py index 3c6b848c1c3..4b72456f6ea 100644 --- a/analyzer/windows/lib/common/constants.py +++ b/analyzer/windows/lib/common/constants.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os from lib.common.rand import random_string diff --git a/analyzer/windows/lib/common/defines.py b/analyzer/windows/lib/common/defines.py index 86f7641a35e..133459601e4 100644 --- a/analyzer/windows/lib/common/defines.py +++ b/analyzer/windows/lib/common/defines.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import from ctypes import ( POINTER, WINFUNCTYPE, diff --git a/analyzer/windows/lib/common/rand.py b/analyzer/windows/lib/common/rand.py index 0bf6244be73..c2a1fc099a6 100644 --- a/analyzer/windows/lib/common/rand.py +++ b/analyzer/windows/lib/common/rand.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import random import string diff --git a/analyzer/windows/lib/common/results.py b/analyzer/windows/lib/common/results.py index 62449ed28a7..bfdeab2b425 100644 --- a/analyzer/windows/lib/common/results.py +++ b/analyzer/windows/lib/common/results.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os import socket diff --git a/analyzer/windows/lib/core/config.py b/analyzer/windows/lib/core/config.py index c9599a8dd4c..0675a358cb9 100644 --- a/analyzer/windows/lib/core/config.py +++ b/analyzer/windows/lib/core/config.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import configparser diff --git a/analyzer/windows/lib/core/log.py b/analyzer/windows/lib/core/log.py index f2ded9c564d..d9a5e653fa7 100644 --- a/analyzer/windows/lib/core/log.py +++ b/analyzer/windows/lib/core/log.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import socket import traceback diff --git a/analyzer/windows/lib/core/privileges.py b/analyzer/windows/lib/core/privileges.py index 73c4dbd21c8..0a240b364b1 100644 --- a/analyzer/windows/lib/core/privileges.py +++ b/analyzer/windows/lib/core/privileges.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import from ctypes import POINTER, wintypes from lib.common.defines import ( diff --git a/analyzer/windows/lib/core/startup.py b/analyzer/windows/lib/core/startup.py index 920b2724235..0ddd8eef50d 100644 --- a/analyzer/windows/lib/core/startup.py +++ b/analyzer/windows/lib/core/startup.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import contextlib import ctypes import logging diff --git a/analyzer/windows/modules/auxiliary/browser.py b/analyzer/windows/modules/auxiliary/browser.py index 4dee5969c62..9b5501e1614 100644 --- a/analyzer/windows/modules/auxiliary/browser.py +++ b/analyzer/windows/modules/auxiliary/browser.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os import time diff --git a/analyzer/windows/modules/auxiliary/curtain.py b/analyzer/windows/modules/auxiliary/curtain.py index 1b934e6c52f..e4a27e4665c 100644 --- a/analyzer/windows/modules/auxiliary/curtain.py +++ b/analyzer/windows/modules/auxiliary/curtain.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import logging import os import subprocess diff --git a/analyzer/windows/modules/auxiliary/digisig.py b/analyzer/windows/modules/auxiliary/digisig.py index c8b8b45a1b1..492eb17d332 100644 --- a/analyzer/windows/modules/auxiliary/digisig.py +++ b/analyzer/windows/modules/auxiliary/digisig.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import json import locale import logging diff --git a/analyzer/windows/modules/auxiliary/disguise.py b/analyzer/windows/modules/auxiliary/disguise.py index 0e0f5671ab7..b62345c89d1 100644 --- a/analyzer/windows/modules/auxiliary/disguise.py +++ b/analyzer/windows/modules/auxiliary/disguise.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import io import itertools import logging diff --git a/analyzer/windows/modules/auxiliary/evtx.py b/analyzer/windows/modules/auxiliary/evtx.py index bf75713a104..9d83b9ef11e 100644 --- a/analyzer/windows/modules/auxiliary/evtx.py +++ b/analyzer/windows/modules/auxiliary/evtx.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import itertools import logging import os diff --git a/analyzer/windows/modules/auxiliary/human.py b/analyzer/windows/modules/auxiliary/human.py index f109ee62059..0a864300bd4 100644 --- a/analyzer/windows/modules/auxiliary/human.py +++ b/analyzer/windows/modules/auxiliary/human.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import contextlib import logging import random diff --git a/analyzer/windows/modules/auxiliary/screenshots.py b/analyzer/windows/modules/auxiliary/screenshots.py index 85b27f755c8..00d8d16fffa 100644 --- a/analyzer/windows/modules/auxiliary/screenshots.py +++ b/analyzer/windows/modules/auxiliary/screenshots.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import time from io import BytesIO diff --git a/analyzer/windows/modules/auxiliary/usage.py b/analyzer/windows/modules/auxiliary/usage.py index fb6b76224d2..5e3ce42f78f 100644 --- a/analyzer/windows/modules/auxiliary/usage.py +++ b/analyzer/windows/modules/auxiliary/usage.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import time from ctypes import byref, create_string_buffer, sizeof diff --git a/analyzer/windows/modules/packages/Shellcode-Unpacker.py b/analyzer/windows/modules/packages/Shellcode-Unpacker.py index 767dddd164d..45d90c171ab 100644 --- a/analyzer/windows/modules/packages/Shellcode-Unpacker.py +++ b/analyzer/windows/modules/packages/Shellcode-Unpacker.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os import shutil diff --git a/analyzer/windows/modules/packages/Shellcode.py b/analyzer/windows/modules/packages/Shellcode.py index 65adbe03011..7c11dc3e0f4 100644 --- a/analyzer/windows/modules/packages/Shellcode.py +++ b/analyzer/windows/modules/packages/Shellcode.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import shutil diff --git a/analyzer/windows/modules/packages/Shellcode_x64.py b/analyzer/windows/modules/packages/Shellcode_x64.py index 6e1b28e5fe4..cfae3f69aea 100644 --- a/analyzer/windows/modules/packages/Shellcode_x64.py +++ b/analyzer/windows/modules/packages/Shellcode_x64.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import shutil diff --git a/analyzer/windows/modules/packages/UPX.py b/analyzer/windows/modules/packages/UPX.py index b77ad0f5c96..6f968fceb70 100644 --- a/analyzer/windows/modules/packages/UPX.py +++ b/analyzer/windows/modules/packages/UPX.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import shutil diff --git a/analyzer/windows/modules/packages/UPX_dll.py b/analyzer/windows/modules/packages/UPX_dll.py index 83cece06fa0..2f1b8aacb20 100644 --- a/analyzer/windows/modules/packages/UPX_dll.py +++ b/analyzer/windows/modules/packages/UPX_dll.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import shutil diff --git a/analyzer/windows/modules/packages/Unpacker_dll.py b/analyzer/windows/modules/packages/Unpacker_dll.py index 02e37971f7f..1e2bb0bb7a7 100644 --- a/analyzer/windows/modules/packages/Unpacker_dll.py +++ b/analyzer/windows/modules/packages/Unpacker_dll.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import shutil diff --git a/analyzer/windows/modules/packages/Unpacker_js.py b/analyzer/windows/modules/packages/Unpacker_js.py index 412926e9e4b..b130fc45557 100644 --- a/analyzer/windows/modules/packages/Unpacker_js.py +++ b/analyzer/windows/modules/packages/Unpacker_js.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os from lib.common.abstracts import Package diff --git a/analyzer/windows/modules/packages/Unpacker_zip.py b/analyzer/windows/modules/packages/Unpacker_zip.py index 995ae9b5032..17e19df4b75 100644 --- a/analyzer/windows/modules/packages/Unpacker_zip.py +++ b/analyzer/windows/modules/packages/Unpacker_zip.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os import shutil diff --git a/analyzer/windows/modules/packages/applet.py b/analyzer/windows/modules/packages/applet.py index 30091a7c0cb..2b614456869 100644 --- a/analyzer/windows/modules/packages/applet.py +++ b/analyzer/windows/modules/packages/applet.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import tempfile from lib.common.abstracts import Package diff --git a/analyzer/windows/modules/packages/dll.py b/analyzer/windows/modules/packages/dll.py index 89912f67e10..b463a2a04ce 100644 --- a/analyzer/windows/modules/packages/dll.py +++ b/analyzer/windows/modules/packages/dll.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import contextlib import os import shutil diff --git a/analyzer/windows/modules/packages/exe.py b/analyzer/windows/modules/packages/exe.py index b8ea51bdbde..6080eadbfd9 100644 --- a/analyzer/windows/modules/packages/exe.py +++ b/analyzer/windows/modules/packages/exe.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import shutil from subprocess import call diff --git a/analyzer/windows/modules/packages/html.py b/analyzer/windows/modules/packages/html.py index c9c6ae608c8..9bf1b2bf6db 100644 --- a/analyzer/windows/modules/packages/html.py +++ b/analyzer/windows/modules/packages/html.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import shutil diff --git a/analyzer/windows/modules/packages/js.py b/analyzer/windows/modules/packages/js.py index 19f141ac865..2fe44202e0d 100644 --- a/analyzer/windows/modules/packages/js.py +++ b/analyzer/windows/modules/packages/js.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os from lib.common.abstracts import Package diff --git a/analyzer/windows/modules/packages/js_antivm.py b/analyzer/windows/modules/packages/js_antivm.py index 409b22d92b7..afeb3c476c1 100644 --- a/analyzer/windows/modules/packages/js_antivm.py +++ b/analyzer/windows/modules/packages/js_antivm.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os from lib.common.abstracts import Package diff --git a/analyzer/windows/modules/packages/processes.py b/analyzer/windows/modules/packages/processes.py index 3bc03abde05..82eb02c4739 100644 --- a/analyzer/windows/modules/packages/processes.py +++ b/analyzer/windows/modules/packages/processes.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import os import time diff --git a/analyzer/windows/modules/packages/processes_simple.py b/analyzer/windows/modules/packages/processes_simple.py index 24401161cb0..f7a45fae1d4 100644 --- a/analyzer/windows/modules/packages/processes_simple.py +++ b/analyzer/windows/modules/packages/processes_simple.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import os import time diff --git a/analyzer/windows/modules/packages/pub.py b/analyzer/windows/modules/packages/pub.py index 49570895e4e..40ae72b1062 100644 --- a/analyzer/windows/modules/packages/pub.py +++ b/analyzer/windows/modules/packages/pub.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import from winreg import HKEY_CURRENT_USER, KEY_READ, KEY_SET_VALUE, REG_DWORD, CreateKeyEx, EnumKey, OpenKey, QueryInfoKey, SetValueEx from lib.common.abstracts import Package diff --git a/analyzer/windows/modules/packages/pub2016.py b/analyzer/windows/modules/packages/pub2016.py index 8e19b4ba529..b0cdd032847 100644 --- a/analyzer/windows/modules/packages/pub2016.py +++ b/analyzer/windows/modules/packages/pub2016.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import from winreg import HKEY_CURRENT_USER, KEY_READ, KEY_SET_VALUE, REG_DWORD, CreateKeyEx, EnumKey, OpenKey, QueryInfoKey, SetValueEx from lib.common.abstracts import Package diff --git a/analyzer/windows/modules/packages/rar.py b/analyzer/windows/modules/packages/rar.py index c2cd793285e..10c274cbdc2 100644 --- a/analyzer/windows/modules/packages/rar.py +++ b/analyzer/windows/modules/packages/rar.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os import re diff --git a/analyzer/windows/modules/packages/service.py b/analyzer/windows/modules/packages/service.py index 061e5d3f1f5..2b5f848e231 100644 --- a/analyzer/windows/modules/packages/service.py +++ b/analyzer/windows/modules/packages/service.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import ctypes import logging import sys diff --git a/analyzer/windows/modules/packages/vawtrak.py b/analyzer/windows/modules/packages/vawtrak.py index a1babb238c4..dadecb2cdc1 100644 --- a/analyzer/windows/modules/packages/vawtrak.py +++ b/analyzer/windows/modules/packages/vawtrak.py @@ -1,6 +1,5 @@ # Andriy :P -from __future__ import absolute_import import os import shutil from subprocess import call diff --git a/analyzer/windows/modules/packages/vbejse.py b/analyzer/windows/modules/packages/vbejse.py index 918fa522d9d..54715d65002 100644 --- a/analyzer/windows/modules/packages/vbejse.py +++ b/analyzer/windows/modules/packages/vbejse.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import from shutil import copyfile from lib.common.abstracts import Package diff --git a/analyzer/windows/modules/packages/vbs.py b/analyzer/windows/modules/packages/vbs.py index 9ec362a3047..e96de10fe4b 100644 --- a/analyzer/windows/modules/packages/vbs.py +++ b/analyzer/windows/modules/packages/vbs.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os from lib.common.abstracts import Package diff --git a/analyzer/windows/modules/packages/zip.py b/analyzer/windows/modules/packages/zip.py index 4dd731daf58..ffdbd157f6d 100644 --- a/analyzer/windows/modules/packages/zip.py +++ b/analyzer/windows/modules/packages/zip.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os import shutil diff --git a/cuckoo.py b/cuckoo.py index 32d350a292d..11b4842d334 100644 --- a/cuckoo.py +++ b/cuckoo.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import argparse import logging import os diff --git a/docs/book/src/conf.py b/docs/book/src/conf.py index 2f397f19aca..9b161e40810 100644 --- a/docs/book/src/conf.py +++ b/docs/book/src/conf.py @@ -10,7 +10,6 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from __future__ import absolute_import import os import sys diff --git a/lib/cuckoo/common/abstracts.py b/lib/cuckoo/common/abstracts.py index 99f56106d00..5b360bbde63 100644 --- a/lib/cuckoo/common/abstracts.py +++ b/lib/cuckoo/common/abstracts.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import datetime import logging import os diff --git a/lib/cuckoo/common/cape_utils.py b/lib/cuckoo/common/cape_utils.py index abc6d20c7b2..667bf9a58fb 100644 --- a/lib/cuckoo/common/cape_utils.py +++ b/lib/cuckoo/common/cape_utils.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import hashlib import logging import os diff --git a/lib/cuckoo/common/colors.py b/lib/cuckoo/common/colors.py index 4a0a0f82ed4..a88c303d0a2 100644 --- a/lib/cuckoo/common/colors.py +++ b/lib/cuckoo/common/colors.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import sys diff --git a/lib/cuckoo/common/compare.py b/lib/cuckoo/common/compare.py index 9dfd0a7b1ad..0b7cf19b9ff 100644 --- a/lib/cuckoo/common/compare.py +++ b/lib/cuckoo/common/compare.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import contextlib import json import zlib diff --git a/lib/cuckoo/common/config.py b/lib/cuckoo/common/config.py index 989fa04c44b..1d84d514874 100644 --- a/lib/cuckoo/common/config.py +++ b/lib/cuckoo/common/config.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import configparser import glob import os diff --git a/lib/cuckoo/common/constants.py b/lib/cuckoo/common/constants.py index feffe5755d7..260c5359f7a 100644 --- a/lib/cuckoo/common/constants.py +++ b/lib/cuckoo/common/constants.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os _current_dir = os.path.abspath(os.path.dirname(__file__)) diff --git a/lib/cuckoo/common/demux.py b/lib/cuckoo/common/demux.py index 37127754245..e914c163f60 100644 --- a/lib/cuckoo/common/demux.py +++ b/lib/cuckoo/common/demux.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import logging import os import sys diff --git a/lib/cuckoo/common/dist_db.py b/lib/cuckoo/common/dist_db.py index f8ea3e2f43d..7957c77438b 100644 --- a/lib/cuckoo/common/dist_db.py +++ b/lib/cuckoo/common/dist_db.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import sys from datetime import datetime diff --git a/lib/cuckoo/common/dns.py b/lib/cuckoo/common/dns.py index ac8f3948309..c5195262f13 100644 --- a/lib/cuckoo/common/dns.py +++ b/lib/cuckoo/common/dns.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import select import socket import threading diff --git a/lib/cuckoo/common/email_utils.py b/lib/cuckoo/common/email_utils.py index 6a51dfd15c3..9abe5e032e7 100644 --- a/lib/cuckoo/common/email_utils.py +++ b/lib/cuckoo/common/email_utils.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import email import mimetypes from email.header import decode_header, make_header diff --git a/lib/cuckoo/common/files.py b/lib/cuckoo/common/files.py index ad54b58e7cb..7a9da0d42c5 100644 --- a/lib/cuckoo/common/files.py +++ b/lib/cuckoo/common/files.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import errno import hashlib import logging diff --git a/lib/cuckoo/common/icon.py b/lib/cuckoo/common/icon.py index a66464fe8a8..754b6628bca 100644 --- a/lib/cuckoo/common/icon.py +++ b/lib/cuckoo/common/icon.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import from ctypes import POINTER, Structure, byref from ctypes import c_ubyte as BYTE from ctypes import c_uint as DWORD diff --git a/lib/cuckoo/common/integrations/XLMMacroDeobfuscator.py b/lib/cuckoo/common/integrations/XLMMacroDeobfuscator.py index b415eea63f3..5fc686d796b 100644 --- a/lib/cuckoo/common/integrations/XLMMacroDeobfuscator.py +++ b/lib/cuckoo/common/integrations/XLMMacroDeobfuscator.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os diff --git a/lib/cuckoo/common/integrations/capa.py b/lib/cuckoo/common/integrations/capa.py index f8ce96e3cfa..0330bdff310 100644 --- a/lib/cuckoo/common/integrations/capa.py +++ b/lib/cuckoo/common/integrations/capa.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import collections import logging import os diff --git a/lib/cuckoo/common/integrations/vba2graph.py b/lib/cuckoo/common/integrations/vba2graph.py index 0a98af57365..33de9aa67a9 100644 --- a/lib/cuckoo/common/integrations/vba2graph.py +++ b/lib/cuckoo/common/integrations/vba2graph.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os diff --git a/lib/cuckoo/common/integrations/vbadeobf.py b/lib/cuckoo/common/integrations/vbadeobf.py index 8fba1b72fc3..d7d98dd7b7c 100644 --- a/lib/cuckoo/common/integrations/vbadeobf.py +++ b/lib/cuckoo/common/integrations/vbadeobf.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import binascii import contextlib import string diff --git a/lib/cuckoo/common/irc.py b/lib/cuckoo/common/irc.py index 29c611d9291..2b5304780eb 100644 --- a/lib/cuckoo/common/irc.py +++ b/lib/cuckoo/common/irc.py @@ -5,7 +5,6 @@ """IRC Protocol""" -from __future__ import absolute_import import logging from io import BytesIO diff --git a/lib/cuckoo/common/logo.py b/lib/cuckoo/common/logo.py index 5538b6dc55c..91df182b05a 100644 --- a/lib/cuckoo/common/logo.py +++ b/lib/cuckoo/common/logo.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import random import sys diff --git a/lib/cuckoo/common/misc.py b/lib/cuckoo/common/misc.py index b4508752a56..2dff920a580 100644 --- a/lib/cuckoo/common/misc.py +++ b/lib/cuckoo/common/misc.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import os from lib.cuckoo.common.constants import CUCKOO_ROOT diff --git a/lib/cuckoo/common/netlog.py b/lib/cuckoo/common/netlog.py index 8d02307970c..ceddfcfa4be 100644 --- a/lib/cuckoo/common/netlog.py +++ b/lib/cuckoo/common/netlog.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import datetime import logging import struct diff --git a/lib/cuckoo/common/objects.py b/lib/cuckoo/common/objects.py index c34333e8e92..308c1d601e1 100644 --- a/lib/cuckoo/common/objects.py +++ b/lib/cuckoo/common/objects.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import binascii import contextlib import copy diff --git a/lib/cuckoo/common/pdftools/pdf-parser.py b/lib/cuckoo/common/pdftools/pdf-parser.py index 36da3518ff8..9cf1997370a 100755 --- a/lib/cuckoo/common/pdftools/pdf-parser.py +++ b/lib/cuckoo/common/pdftools/pdf-parser.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -from __future__ import absolute_import, print_function - __description__ = "pdf-parser, use it to parse a PDF document" __author__ = "Didier Stevens" __version__ = "0.7.5" diff --git a/lib/cuckoo/common/pdftools/pdfid.py b/lib/cuckoo/common/pdftools/pdfid.py index 8e57e99b90d..909eb0cb43e 100644 --- a/lib/cuckoo/common/pdftools/pdfid.py +++ b/lib/cuckoo/common/pdftools/pdfid.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -from __future__ import absolute_import, print_function - __description__ = "Tool to test a PDF file" __author__ = "Didier Stevens" __version__ = "0.2.7" diff --git a/lib/cuckoo/common/quarantine.py b/lib/cuckoo/common/quarantine.py index fd93b5d0fbe..0d8db1e29a8 100644 --- a/lib/cuckoo/common/quarantine.py +++ b/lib/cuckoo/common/quarantine.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import contextlib import hashlib import logging diff --git a/lib/cuckoo/common/saztopcap.py b/lib/cuckoo/common/saztopcap.py index 5cf261fa287..c30ae3f9089 100644 --- a/lib/cuckoo/common/saztopcap.py +++ b/lib/cuckoo/common/saztopcap.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import glob import logging import os diff --git a/lib/cuckoo/common/url_validate.py b/lib/cuckoo/common/url_validate.py index d3f7f7b5fd2..9df8de2a461 100644 --- a/lib/cuckoo/common/url_validate.py +++ b/lib/cuckoo/common/url_validate.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import re # this is with some fixes https://github.com/kvesteri/validators/blob/master/validators/url.py diff --git a/lib/cuckoo/common/utils.py b/lib/cuckoo/common/utils.py index a3a5574210a..31834587ca0 100644 --- a/lib/cuckoo/common/utils.py +++ b/lib/cuckoo/common/utils.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import contextlib import errno import fcntl diff --git a/lib/cuckoo/common/utils_pretty_print_funcs.py b/lib/cuckoo/common/utils_pretty_print_funcs.py index f02208c3f6f..7d2cb48ec0c 100644 --- a/lib/cuckoo/common/utils_pretty_print_funcs.py +++ b/lib/cuckoo/common/utils_pretty_print_funcs.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - import lib.cuckoo.common.utils_dicts as utils_dicts diff --git a/lib/cuckoo/common/web_utils.py b/lib/cuckoo/common/web_utils.py index 39ad2ac8fb8..66576ce9e27 100644 --- a/lib/cuckoo/common/web_utils.py +++ b/lib/cuckoo/common/web_utils.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import hashlib import json import logging diff --git a/lib/cuckoo/core/database.py b/lib/cuckoo/core/database.py index 055f368ebc2..16475a328fe 100644 --- a/lib/cuckoo/core/database.py +++ b/lib/cuckoo/core/database.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import json import logging import os diff --git a/lib/cuckoo/core/guest.py b/lib/cuckoo/core/guest.py index 03906145b24..b08c3cf2066 100644 --- a/lib/cuckoo/core/guest.py +++ b/lib/cuckoo/core/guest.py @@ -3,7 +3,6 @@ # See the file 'docs/LICENSE' for copying permission. # https://github.com/cuckoosandbox/cuckoo/blob/master/cuckoo/core/guest.py -from __future__ import absolute_import import datetime import json import logging diff --git a/lib/cuckoo/core/plugins.py b/lib/cuckoo/core/plugins.py index a66db9f91f3..62882b81db2 100644 --- a/lib/cuckoo/core/plugins.py +++ b/lib/cuckoo/core/plugins.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import inspect import json import logging diff --git a/lib/cuckoo/core/resultserver.py b/lib/cuckoo/core/resultserver.py index 68f5102286b..319e41722dc 100644 --- a/lib/cuckoo/core/resultserver.py +++ b/lib/cuckoo/core/resultserver.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import errno import json import logging diff --git a/lib/cuckoo/core/rooter.py b/lib/cuckoo/core/rooter.py index 138bb0a7091..a5a8f1ebd49 100644 --- a/lib/cuckoo/core/rooter.py +++ b/lib/cuckoo/core/rooter.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import json import logging import os.path diff --git a/lib/cuckoo/core/scheduler.py b/lib/cuckoo/core/scheduler.py index acd542848f8..ec4e2e1819d 100644 --- a/lib/cuckoo/core/scheduler.py +++ b/lib/cuckoo/core/scheduler.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os import queue diff --git a/lib/cuckoo/core/startup.py b/lib/cuckoo/core/startup.py index 96958b44275..807716f31e3 100644 --- a/lib/cuckoo/core/startup.py +++ b/lib/cuckoo/core/startup.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import copy import logging import logging.handlers diff --git a/modules/auxiliary/sniffer.py b/modules/auxiliary/sniffer.py index a590e1112b2..142766e69ca 100644 --- a/modules/auxiliary/sniffer.py +++ b/modules/auxiliary/sniffer.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import getpass import logging import os diff --git a/modules/machinery/aws.py b/modules/machinery/aws.py index 812d58ee669..d7678d3ac70 100644 --- a/modules/machinery/aws.py +++ b/modules/machinery/aws.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import logging import time diff --git a/modules/machinery/esx.py b/modules/machinery/esx.py index 177434f7271..23289cd2f92 100644 --- a/modules/machinery/esx.py +++ b/modules/machinery/esx.py @@ -3,8 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - import libvirt from lib.cuckoo.common.abstracts import LibVirtMachinery diff --git a/modules/machinery/kvm.py b/modules/machinery/kvm.py index 0ea724509d6..48a06a4ce63 100644 --- a/modules/machinery/kvm.py +++ b/modules/machinery/kvm.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import xml.etree.ElementTree as ET from lib.cuckoo.common.abstracts import LibVirtMachinery diff --git a/modules/machinery/multi.py b/modules/machinery/multi.py index 618df3c2d9e..6c8a7f34163 100644 --- a/modules/machinery/multi.py +++ b/modules/machinery/multi.py @@ -8,7 +8,6 @@ Pseudo-machinery for using multiple machinery. """ -from __future__ import absolute_import import inspect import types diff --git a/modules/machinery/proxmox.py b/modules/machinery/proxmox.py index c08e0e82325..5be3e8af5f6 100644 --- a/modules/machinery/proxmox.py +++ b/modules/machinery/proxmox.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import sys import time diff --git a/modules/machinery/qemu.py b/modules/machinery/qemu.py index 0efe9463dd2..2d166d6a378 100644 --- a/modules/machinery/qemu.py +++ b/modules/machinery/qemu.py @@ -4,7 +4,6 @@ # https://qemu.readthedocs.io/en/latest/ -from __future__ import absolute_import import logging import os import os.path diff --git a/modules/machinery/virtualbox.py b/modules/machinery/virtualbox.py index d0fc8c4b9f2..fb66caa3066 100644 --- a/modules/machinery/virtualbox.py +++ b/modules/machinery/virtualbox.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os import os.path diff --git a/modules/machinery/vmware.py b/modules/machinery/vmware.py index 288b2590448..bc8250ac672 100644 --- a/modules/machinery/vmware.py +++ b/modules/machinery/vmware.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import glob import logging import os.path diff --git a/modules/machinery/vmwareserver.py b/modules/machinery/vmwareserver.py index 784773252b8..ce67226ff23 100644 --- a/modules/machinery/vmwareserver.py +++ b/modules/machinery/vmwareserver.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os.path import subprocess diff --git a/modules/machinery/vsphere.py b/modules/machinery/vsphere.py index 2118c365c3e..9d0ab568bf9 100644 --- a/modules/machinery/vsphere.py +++ b/modules/machinery/vsphere.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import random import re diff --git a/modules/machinery/xenserver.py b/modules/machinery/xenserver.py index 1bcc291f4a8..d74c394609e 100644 --- a/modules/machinery/xenserver.py +++ b/modules/machinery/xenserver.py @@ -6,7 +6,6 @@ XenServer machinery. """ -from __future__ import absolute_import import logging import threading diff --git a/modules/processing/CAPE.py b/modules/processing/CAPE.py index ff219c89899..15a5d43c5fb 100644 --- a/modules/processing/CAPE.py +++ b/modules/processing/CAPE.py @@ -12,7 +12,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import absolute_import import hashlib import imp import json diff --git a/modules/processing/analysisinfo.py b/modules/processing/analysisinfo.py index 05fefd2f80a..b863801bc23 100644 --- a/modules/processing/analysisinfo.py +++ b/modules/processing/analysisinfo.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import codecs import logging import os diff --git a/modules/processing/antiransomware.py b/modules/processing/antiransomware.py index b6872e1b29a..191c3f87ed3 100644 --- a/modules/processing/antiransomware.py +++ b/modules/processing/antiransomware.py @@ -12,7 +12,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import absolute_import import json import logging import os diff --git a/modules/processing/behavior.py b/modules/processing/behavior.py index 7157e6d589f..af845716457 100644 --- a/modules/processing/behavior.py +++ b/modules/processing/behavior.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import datetime import logging import os diff --git a/modules/processing/curtain.py b/modules/processing/curtain.py index 1a00fcc8fec..a8f93a538e0 100644 --- a/modules/processing/curtain.py +++ b/modules/processing/curtain.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import ast import base64 import itertools diff --git a/modules/processing/debug.py b/modules/processing/debug.py index 8d26c6caae9..00c5cf691f2 100644 --- a/modules/processing/debug.py +++ b/modules/processing/debug.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import codecs import os diff --git a/modules/processing/decompression.py b/modules/processing/decompression.py index ba31c0bcacd..2b700d15439 100644 --- a/modules/processing/decompression.py +++ b/modules/processing/decompression.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import glob import os import zipfile diff --git a/modules/processing/deduplication.py b/modules/processing/deduplication.py index f94826c0d71..d5af72f8f19 100644 --- a/modules/processing/deduplication.py +++ b/modules/processing/deduplication.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os diff --git a/modules/processing/dropped.py b/modules/processing/dropped.py index e15336d8929..9022c84faa8 100644 --- a/modules/processing/dropped.py +++ b/modules/processing/dropped.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import json import os diff --git a/modules/processing/maliciousmacrobot.py b/modules/processing/maliciousmacrobot.py index 60bd0af76e5..964e58358a1 100644 --- a/modules/processing/maliciousmacrobot.py +++ b/modules/processing/maliciousmacrobot.py @@ -12,7 +12,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import absolute_import import logging import os diff --git a/modules/processing/memory.py b/modules/processing/memory.py index b665d4a1e65..3a010277b87 100644 --- a/modules/processing/memory.py +++ b/modules/processing/memory.py @@ -7,7 +7,6 @@ # Vol3 docs - https://volatility3.readthedocs.io/en/latest/index.html -from __future__ import absolute_import import logging import os from typing import Any, Dict, List, Optional, Tuple, Union diff --git a/modules/processing/network.py b/modules/processing/network.py index 3a72435a824..81c025d7178 100644 --- a/modules/processing/network.py +++ b/modules/processing/network.py @@ -6,7 +6,6 @@ # http://stackoverflow.com/questions/10665925/how-to-sort-huge-files-with-python # http://code.activestate.com/recipes/576755/ -from __future__ import absolute_import import binascii import heapq import logging diff --git a/modules/processing/parsers/CAPE/BackOffLoader.py b/modules/processing/parsers/CAPE/BackOffLoader.py index 8bfad24cbaf..f62fd29461d 100644 --- a/modules/processing/parsers/CAPE/BackOffLoader.py +++ b/modules/processing/parsers/CAPE/BackOffLoader.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function from binascii import hexlify from hashlib import md5 from struct import unpack_from diff --git a/modules/processing/parsers/CAPE/BackOffPOS.py b/modules/processing/parsers/CAPE/BackOffPOS.py index 3f30facb0f7..c3bc9693af0 100644 --- a/modules/processing/parsers/CAPE/BackOffPOS.py +++ b/modules/processing/parsers/CAPE/BackOffPOS.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function from binascii import hexlify from hashlib import md5 from struct import unpack_from diff --git a/modules/processing/parsers/CAPE/CobaltStrikeBeacon.py b/modules/processing/parsers/CAPE/CobaltStrikeBeacon.py index 048897d6883..ced0988ab0d 100644 --- a/modules/processing/parsers/CAPE/CobaltStrikeBeacon.py +++ b/modules/processing/parsers/CAPE/CobaltStrikeBeacon.py @@ -9,7 +9,6 @@ 2. Dynamic size parsing """ -from __future__ import absolute_import, print_function import argparse import io import json diff --git a/modules/processing/parsers/CAPE/Greame.py b/modules/processing/parsers/CAPE/Greame.py index 88b46abff47..0a7aeb1c128 100644 --- a/modules/processing/parsers/CAPE/Greame.py +++ b/modules/processing/parsers/CAPE/Greame.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import string import pefile diff --git a/modules/processing/parsers/CAPE/JavaDropper.py_disabled b/modules/processing/parsers/CAPE/JavaDropper.py_disabled index 7ee4f6a2241..af210be7b1f 100644 --- a/modules/processing/parsers/CAPE/JavaDropper.py_disabled +++ b/modules/processing/parsers/CAPE/JavaDropper.py_disabled @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import absolute_import, print_function import hashlib import string import zlib diff --git a/modules/processing/parsers/CAPE/Nymaim.py_disabled b/modules/processing/parsers/CAPE/Nymaim.py_disabled index edccce72d2b..9be09243a0b 100644 --- a/modules/processing/parsers/CAPE/Nymaim.py_disabled +++ b/modules/processing/parsers/CAPE/Nymaim.py_disabled @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import re import string import struct diff --git a/modules/processing/parsers/CAPE/Pandora.py b/modules/processing/parsers/CAPE/Pandora.py index 5ec8b363988..637d844312d 100644 --- a/modules/processing/parsers/CAPE/Pandora.py +++ b/modules/processing/parsers/CAPE/Pandora.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import pefile diff --git a/modules/processing/parsers/CAPE/PoisonIvy.py b/modules/processing/parsers/CAPE/PoisonIvy.py index cf443b55a73..c7c063d0fef 100644 --- a/modules/processing/parsers/CAPE/PoisonIvy.py +++ b/modules/processing/parsers/CAPE/PoisonIvy.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import string from struct import unpack diff --git a/modules/processing/parsers/CAPE/PredatorPain.py_disabled b/modules/processing/parsers/CAPE/PredatorPain.py_disabled index f7cc36e8111..fb2ecc0a6d5 100644 --- a/modules/processing/parsers/CAPE/PredatorPain.py_disabled +++ b/modules/processing/parsers/CAPE/PredatorPain.py_disabled @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function from base64 import b64decode from binascii import unhexlify diff --git a/modules/processing/parsers/CAPE/REvil.py b/modules/processing/parsers/CAPE/REvil.py index 5a808bcc7a3..c5c20c48439 100644 --- a/modules/processing/parsers/CAPE/REvil.py +++ b/modules/processing/parsers/CAPE/REvil.py @@ -14,7 +14,6 @@ #!/usr/bin/python -from __future__ import absolute_import import json import struct diff --git a/modules/processing/parsers/CAPE/Strrat.py b/modules/processing/parsers/CAPE/Strrat.py index 4f03f959dbb..c6d5390185c 100644 --- a/modules/processing/parsers/CAPE/Strrat.py +++ b/modules/processing/parsers/CAPE/Strrat.py @@ -20,7 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import, print_function import base64 import zipfile from hashlib import pbkdf2_hmac diff --git a/modules/processing/parsers/CAPE/TSCookie.py b/modules/processing/parsers/CAPE/TSCookie.py index 1b5be2611cf..4575ea30d9d 100644 --- a/modules/processing/parsers/CAPE/TSCookie.py +++ b/modules/processing/parsers/CAPE/TSCookie.py @@ -5,7 +5,6 @@ # # Credit to JPCERT - this is derived from https://github.com/JPCERTCC/aa-tools/blob/master/tscookie_decode.py -from __future__ import absolute_import import collections import re import sys diff --git a/modules/processing/parsers/CAPE/TrickBot.py b/modules/processing/parsers/CAPE/TrickBot.py index 6c3a108e0dd..56066469bb2 100644 --- a/modules/processing/parsers/CAPE/TrickBot.py +++ b/modules/processing/parsers/CAPE/TrickBot.py @@ -21,7 +21,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import import hashlib import struct import xml.etree.ElementTree as ET diff --git a/modules/processing/parsers/CAPE/UrsnifV3.py b/modules/processing/parsers/CAPE/UrsnifV3.py index f08ade33206..a1d4f05d5e9 100644 --- a/modules/processing/parsers/CAPE/UrsnifV3.py +++ b/modules/processing/parsers/CAPE/UrsnifV3.py @@ -12,7 +12,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import absolute_import import binascii import struct diff --git a/modules/processing/parsers/CAPE/_ShadowTech.py_disabled b/modules/processing/parsers/CAPE/_ShadowTech.py_disabled index 3f4718c3bf0..262291ef7de 100644 --- a/modules/processing/parsers/CAPE/_ShadowTech.py_disabled +++ b/modules/processing/parsers/CAPE/_ShadowTech.py_disabled @@ -3,7 +3,6 @@ ShadowTech Config Extractor """ -from __future__ import absolute_import, print_function import re import string diff --git a/modules/processing/parsers/CAPE/_VirusRat.py_disabled b/modules/processing/parsers/CAPE/_VirusRat.py_disabled index 1ac9f652c5d..108bac4e239 100644 --- a/modules/processing/parsers/CAPE/_VirusRat.py_disabled +++ b/modules/processing/parsers/CAPE/_VirusRat.py_disabled @@ -1,4 +1,3 @@ -from __future__ import absolute_import import re import database diff --git a/modules/processing/parsers/CAPE/_jRat.py_disabled b/modules/processing/parsers/CAPE/_jRat.py_disabled index 2d4dea494c8..80fe8843a7d 100644 --- a/modules/processing/parsers/CAPE/_jRat.py_disabled +++ b/modules/processing/parsers/CAPE/_jRat.py_disabled @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import re from base64 import b64decode from io import StringIO diff --git a/modules/processing/parsers/CAPE/test_cape.py b/modules/processing/parsers/CAPE/test_cape.py index 318943d2831..f9190c3c306 100644 --- a/modules/processing/parsers/CAPE/test_cape.py +++ b/modules/processing/parsers/CAPE/test_cape.py @@ -1,5 +1,2 @@ -from __future__ import absolute_import - - def extract_config(): pass diff --git a/modules/processing/parsers/CAPE/unrecom.py b/modules/processing/parsers/CAPE/unrecom.py index d969418d3f7..172369bc4ce 100644 --- a/modules/processing/parsers/CAPE/unrecom.py +++ b/modules/processing/parsers/CAPE/unrecom.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import string import xml.etree.ElementTree as ET from io import StringIO diff --git a/modules/processing/parsers/CAPE/xRAT.py_disabled b/modules/processing/parsers/CAPE/xRAT.py_disabled index bcbd6f88e44..34bc46ddca7 100644 --- a/modules/processing/parsers/CAPE/xRAT.py_disabled +++ b/modules/processing/parsers/CAPE/xRAT.py_disabled @@ -1,4 +1,3 @@ -from __future__ import absolute_import import hashlib import re from base64 import b64decode diff --git a/modules/processing/parsers/mwcp/test_mwcp.py b/modules/processing/parsers/mwcp/test_mwcp.py index 8d42a5f9803..6a64efb6c3c 100644 --- a/modules/processing/parsers/mwcp/test_mwcp.py +++ b/modules/processing/parsers/mwcp/test_mwcp.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from mwcp.parser import Parser diff --git a/modules/processing/parsers/plugxconfig/plugx.py b/modules/processing/parsers/plugxconfig/plugx.py index 4848784f42b..1e7d6ed8399 100644 --- a/modules/processing/parsers/plugxconfig/plugx.py +++ b/modules/processing/parsers/plugxconfig/plugx.py @@ -22,7 +22,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from __future__ import absolute_import import socket from collections import OrderedDict, defaultdict from socket import inet_ntoa diff --git a/modules/processing/procdump.py b/modules/processing/procdump.py index a68a2fd6984..68d9bf16b7b 100644 --- a/modules/processing/procdump.py +++ b/modules/processing/procdump.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import json import os from datetime import datetime diff --git a/modules/processing/procmemory.py b/modules/processing/procmemory.py index e29d0dc7312..3102b7c8adb 100644 --- a/modules/processing/procmemory.py +++ b/modules/processing/procmemory.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os diff --git a/modules/processing/strings.py b/modules/processing/strings.py index d0ad728f81f..dcb11874b60 100644 --- a/modules/processing/strings.py +++ b/modules/processing/strings.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os.path from lib.cuckoo.common.abstracts import Processing diff --git a/modules/processing/suricata.py b/modules/processing/suricata.py index dd0c7a280c3..dd150918ee1 100644 --- a/modules/processing/suricata.py +++ b/modules/processing/suricata.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import datetime import json import logging diff --git a/modules/processing/sysmon.py b/modules/processing/sysmon.py index 56a1f20001a..f532cc0882b 100644 --- a/modules/processing/sysmon.py +++ b/modules/processing/sysmon.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import logging import os import re diff --git a/modules/processing/targetinfo.py b/modules/processing/targetinfo.py index 2cfe512f96a..d67cfae7609 100644 --- a/modules/processing/targetinfo.py +++ b/modules/processing/targetinfo.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os.path from lib.cuckoo.common.abstracts import Processing diff --git a/modules/processing/usage.py b/modules/processing/usage.py index ea9384fc484..1747da5687a 100644 --- a/modules/processing/usage.py +++ b/modules/processing/usage.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os from lib.cuckoo.common.abstracts import Processing diff --git a/modules/reporting/bingraph.py b/modules/reporting/bingraph.py index fcfaf349a86..41497e403f3 100644 --- a/modules/reporting/bingraph.py +++ b/modules/reporting/bingraph.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os diff --git a/modules/reporting/callback.py b/modules/reporting/callback.py index 83cc3ee2cbb..3e381d0c3d6 100644 --- a/modules/reporting/callback.py +++ b/modules/reporting/callback.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import json import logging diff --git a/modules/reporting/compression.py b/modules/reporting/compression.py index bfb654d9dbc..6c516d0373a 100644 --- a/modules/reporting/compression.py +++ b/modules/reporting/compression.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import zipfile diff --git a/modules/reporting/compressresults.py b/modules/reporting/compressresults.py index e1fee444ef8..f3cacec3d14 100644 --- a/modules/reporting/compressresults.py +++ b/modules/reporting/compressresults.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import json import logging import zlib diff --git a/modules/reporting/jsondump.py b/modules/reporting/jsondump.py index 1d74e65bd58..7b21eb92bc6 100644 --- a/modules/reporting/jsondump.py +++ b/modules/reporting/jsondump.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os from lib.cuckoo.common.abstracts import Report diff --git a/modules/reporting/litereport.py b/modules/reporting/litereport.py index ed0702b7270..37988e31291 100644 --- a/modules/reporting/litereport.py +++ b/modules/reporting/litereport.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os from lib.cuckoo.common.abstracts import Report diff --git a/modules/reporting/maec41.py b/modules/reporting/maec41.py index 79c0148f1cc..7757be0db03 100644 --- a/modules/reporting/maec41.py +++ b/modules/reporting/maec41.py @@ -5,7 +5,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file "docs/LICENSE" for copying permission. -from __future__ import absolute_import import hashlib import os import re diff --git a/modules/reporting/maec5.py b/modules/reporting/maec5.py index ad98009235a..7d82b732437 100644 --- a/modules/reporting/maec5.py +++ b/modules/reporting/maec5.py @@ -5,7 +5,6 @@ # MAEC 5.0 Cuckoo Report Module # https://maecproject.github.io/releases/5.0/MAEC_Vocabularies_Specification.pdf -from __future__ import absolute_import import io import json import logging diff --git a/modules/reporting/mitre.py b/modules/reporting/mitre.py index 815097a1a1c..d21246c592b 100644 --- a/modules/reporting/mitre.py +++ b/modules/reporting/mitre.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import logging from lib.cuckoo.common.abstracts import Report diff --git a/modules/reporting/mongodb.py b/modules/reporting/mongodb.py index 17d1c1a8667..44c594adc49 100644 --- a/modules/reporting/mongodb.py +++ b/modules/reporting/mongodb.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import gc import logging diff --git a/modules/reporting/reporthtml.py b/modules/reporting/reporthtml.py index 4c35d7a3653..20bb6e4c08c 100644 --- a/modules/reporting/reporthtml.py +++ b/modules/reporting/reporthtml.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import base64 import codecs import os diff --git a/modules/reporting/reporthtmlsummary.py b/modules/reporting/reporthtmlsummary.py index c7edfbf0a0c..49a81355757 100644 --- a/modules/reporting/reporthtmlsummary.py +++ b/modules/reporting/reporthtmlsummary.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import base64 import codecs import os diff --git a/modules/reporting/reportpdf.py b/modules/reporting/reportpdf.py index 90970fbd44a..3be495fa3d6 100644 --- a/modules/reporting/reportpdf.py +++ b/modules/reporting/reportpdf.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import logging import os from subprocess import call diff --git a/modules/reporting/resubmitexe.py b/modules/reporting/resubmitexe.py index 17571415d0d..e02e460447b 100644 --- a/modules/reporting/resubmitexe.py +++ b/modules/reporting/resubmitexe.py @@ -12,7 +12,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import absolute_import import datetime import logging import ntpath diff --git a/modules/reporting/retention.py b/modules/reporting/retention.py index 1f5bde03c81..af84ddb1859 100644 --- a/modules/reporting/retention.py +++ b/modules/reporting/retention.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import json import logging import os diff --git a/modules/reporting/submitCAPE.py b/modules/reporting/submitCAPE.py index f988a9aedd1..1f25e88d8e4 100644 --- a/modules/reporting/submitCAPE.py +++ b/modules/reporting/submitCAPE.py @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import absolute_import import logging import os diff --git a/modules/reporting/syslog.py b/modules/reporting/syslog.py index 2821f8b1511..4862479d7c5 100644 --- a/modules/reporting/syslog.py +++ b/modules/reporting/syslog.py @@ -14,7 +14,6 @@ -KillerInstinct """ -from __future__ import absolute_import import os import socket diff --git a/modules/reporting/tmpfsclean.py b/modules/reporting/tmpfsclean.py index 877c7b38af0..ebb985c070b 100644 --- a/modules/reporting/tmpfsclean.py +++ b/modules/reporting/tmpfsclean.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import logging import os import shutil diff --git a/tests/email_test.py b/tests/email_test.py index de572f5332b..a28ee2f7713 100644 --- a/tests/email_test.py +++ b/tests/email_test.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import os import sys from datetime import datetime diff --git a/tests/integrity.py b/tests/integrity.py index 3088d4165f5..b36bba3a635 100644 --- a/tests/integrity.py +++ b/tests/integrity.py @@ -9,7 +9,6 @@ that there are no remaining tasks in the queue this utility will clean the entire database before starting various analyses. """ -from __future__ import absolute_import, print_function import argparse import json import logging diff --git a/tests/processor_tests.py b/tests/processor_tests.py index d12d4f15f18..8c211e5a35a 100644 --- a/tests/processor_tests.py +++ b/tests/processor_tests.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import tempfile diff --git a/tests/reporter_tests.py b/tests/reporter_tests.py index b34d407d9ee..49b345e0189 100644 --- a/tests/reporter_tests.py +++ b/tests/reporter_tests.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import tempfile diff --git a/tests/sniffer_tests.py b/tests/sniffer_tests.py index 049e551ee88..59160bd83b2 100644 --- a/tests/sniffer_tests.py +++ b/tests/sniffer_tests.py @@ -2,6 +2,4 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - from nose.tools import assert_equals diff --git a/tests/test_abstracts.py b/tests/test_abstracts.py index c727b96541a..23b2eff22f5 100644 --- a/tests/test_abstracts.py +++ b/tests/test_abstracts.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import tempfile diff --git a/tests/test_aplib.py b/tests/test_aplib.py index f11aa96515d..68299796f1f 100644 --- a/tests/test_aplib.py +++ b/tests/test_aplib.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - from lib.cuckoo.common import aplib diff --git a/tests/test_behavior.py b/tests/test_behavior.py index fa23b04ab5b..1ba7d6337cf 100644 --- a/tests/test_behavior.py +++ b/tests/test_behavior.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - from modules.processing.behavior import ParseProcessLog diff --git a/tests/test_colors.py b/tests/test_colors.py index 8c7681d6dbc..d54cb2ebd33 100644 --- a/tests/test_colors.py +++ b/tests/test_colors.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - from lib.cuckoo.common.colors import black, blue, bold, color, cyan, green, magenta, red, white, yellow # noqa: F401 diff --git a/tests/test_compressor.py b/tests/test_compressor.py index dbec4c97f06..c7564fa2174 100644 --- a/tests/test_compressor.py +++ b/tests/test_compressor.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import os import pathlib diff --git a/tests/test_config.py b/tests/test_config.py index 988c01c4476..2f6eb82b378 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import configparser import textwrap diff --git a/tests/test_database.py b/tests/test_database.py index 8095820e192..c9d5b032f7e 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import base64 import os import shutil diff --git a/tests/test_demux.py b/tests/test_demux.py index 5155b898d91..882ed67e760 100644 --- a/tests/test_demux.py +++ b/tests/test_demux.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import pathlib import tempfile diff --git a/tests/test_dist_db.py b/tests/test_dist_db.py index ca739a0a9a0..3a3f97ce1b9 100644 --- a/tests/test_dist_db.py +++ b/tests/test_dist_db.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - from sqlalchemy import Table from lib.cuckoo.common.dist_db import Machine, Node, StringList, Task, create_session diff --git a/tests/test_files.py b/tests/test_files.py index cbc811e4cf3..2b63390184f 100644 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import io import os import shutil diff --git a/tests/test_icon.py b/tests/test_icon.py index 55ea1da714c..7d6433050de 100644 --- a/tests/test_icon.py +++ b/tests/test_icon.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import pathlib import pytest diff --git a/tests/test_logo.py b/tests/test_logo.py index 99e23b1d86a..b414b1a3934 100644 --- a/tests/test_logo.py +++ b/tests/test_logo.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - from lib.cuckoo.common import logo diff --git a/tests/test_netlog.py b/tests/test_netlog.py index 797b79e45ad..ed5c32d7854 100644 --- a/tests/test_netlog.py +++ b/tests/test_netlog.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import datetime import os import pathlib diff --git a/tests/test_objects.py b/tests/test_objects.py index 23b2592c05d..5082e2fb5e7 100644 --- a/tests/test_objects.py +++ b/tests/test_objects.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import logging import os import pathlib diff --git a/tests/test_quarantine.py b/tests/test_quarantine.py index 827c3d2b65f..5c36a7fdc9d 100644 --- a/tests/test_quarantine.py +++ b/tests/test_quarantine.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import pathlib import tempfile diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py index 9e9d73605a4..c7efcd11c9f 100644 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import os import pathlib import queue diff --git a/tests/test_suricata_naming.py b/tests/test_suricata_naming.py index 4fe2799dc3d..ecef85ff73d 100644 --- a/tests/test_suricata_naming.py +++ b/tests/test_suricata_naming.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import os import sys diff --git a/tests/test_utils.py b/tests/test_utils.py index 0331ff06281..02c9a8bc5b5 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import os import pytest diff --git a/tests/test_utils_pretty_print_funcs.py b/tests/test_utils_pretty_print_funcs.py index 98eca2ac3bf..17a97c6fd38 100644 --- a/tests/test_utils_pretty_print_funcs.py +++ b/tests/test_utils_pretty_print_funcs.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import os import random diff --git a/tests/test_web_utils.py b/tests/test_web_utils.py index 1d2114c4ec9..fa8a1ed4ebc 100644 --- a/tests/test_web_utils.py +++ b/tests/test_web_utils.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import os import tempfile diff --git a/utils/admin.py b/utils/admin.py index 639682126c1..c9608147955 100644 --- a/utils/admin.py +++ b/utils/admin.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import os import shutil import sys diff --git a/utils/cleaners.py b/utils/cleaners.py index 5da7c2c50d7..047ebac3a68 100644 --- a/utils/cleaners.py +++ b/utils/cleaners.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import argparse import atexit import logging diff --git a/utils/cuckoomx.py b/utils/cuckoomx.py index 65776622116..45bd4c84b2f 100644 --- a/utils/cuckoomx.py +++ b/utils/cuckoomx.py @@ -1,5 +1,4 @@ #!/bin/python -from __future__ import absolute_import, print_function import email import hashlib import imaplib diff --git a/utils/db_migration/env.py b/utils/db_migration/env.py index 76b2d35de4b..74eb881a210 100644 --- a/utils/db_migration/env.py +++ b/utils/db_migration/env.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, with_statement import os.path import sys from logging.config import fileConfig diff --git a/utils/db_migration/versions/add_distributed.py b/utils/db_migration/versions/add_distributed.py index 53b7dfa027c..d22e01ed567 100644 --- a/utils/db_migration/versions/add_distributed.py +++ b/utils/db_migration/versions/add_distributed.py @@ -15,8 +15,6 @@ """ # revision identifiers, used by Alembic. -from __future__ import absolute_import - revision = "e4954d358c80" down_revision = "36926b59dfbb" diff --git a/utils/db_migration/versions/add_sample_parent_id.py b/utils/db_migration/versions/add_sample_parent_id.py index 710b8dd1689..cdf0b893802 100644 --- a/utils/db_migration/versions/add_sample_parent_id.py +++ b/utils/db_migration/versions/add_sample_parent_id.py @@ -13,8 +13,6 @@ """ # revision identifiers, used by Alembic. -from __future__ import absolute_import, print_function - revision = "36926b59dfbb" down_revision = "3c8bf4133b44" diff --git a/utils/db_migration/versions/add_shrike_and_parent_id_columns.py b/utils/db_migration/versions/add_shrike_and_parent_id_columns.py index d55099364b3..e345d325692 100644 --- a/utils/db_migration/versions/add_shrike_and_parent_id_columns.py +++ b/utils/db_migration/versions/add_shrike_and_parent_id_columns.py @@ -10,8 +10,6 @@ """ # revision identifiers, used by Alembic. -from __future__ import absolute_import, print_function - revision = "f111620bb8" down_revision = "4b09c454108c" diff --git a/utils/db_migration/versions/add_task_tlp.py b/utils/db_migration/versions/add_task_tlp.py index 03f89c5adb9..b3f833cabb8 100644 --- a/utils/db_migration/versions/add_task_tlp.py +++ b/utils/db_migration/versions/add_task_tlp.py @@ -9,8 +9,6 @@ Create Date: 2020-04-10 12:17:18.530901 """ -from __future__ import absolute_import, print_function - # revision identifiers, used by Alembic. revision = "7331c4d994fd" down_revision = "30d0230de7cd" diff --git a/utils/db_migration/versions/from_0_6_to_1_1.py b/utils/db_migration/versions/from_0_6_to_1_1.py index 3a89b4abc71..e55d39c2020 100644 --- a/utils/db_migration/versions/from_0_6_to_1_1.py +++ b/utils/db_migration/versions/from_0_6_to_1_1.py @@ -11,8 +11,6 @@ """ # Revision identifiers, used by Alembic. -from __future__ import absolute_import, print_function - revision = "263a45963c72" mongo_revision = "1" down_revision = None diff --git a/utils/db_migration/versions/from_1_1_to_1_2-added_states.py b/utils/db_migration/versions/from_1_1_to_1_2-added_states.py index 138c79acbc1..fe5c6c6d4fb 100644 --- a/utils/db_migration/versions/from_1_1_to_1_2-added_states.py +++ b/utils/db_migration/versions/from_1_1_to_1_2-added_states.py @@ -11,8 +11,6 @@ # Spaghetti as a way of life. # Revision identifiers, used by Alembic. -from __future__ import absolute_import, print_function - revision = "495d5a6edef3" down_revision = "18eee46c6f81" diff --git a/utils/db_migration/versions/from_1_1_to_1_2-extend_file_type.py b/utils/db_migration/versions/from_1_1_to_1_2-extend_file_type.py index 456affeba1c..3b899f69d90 100644 --- a/utils/db_migration/versions/from_1_1_to_1_2-extend_file_type.py +++ b/utils/db_migration/versions/from_1_1_to_1_2-extend_file_type.py @@ -12,8 +12,6 @@ """ # Revision identifiers, used by Alembic. -from __future__ import absolute_import - revision = "18eee46c6f81" down_revision = "263a45963c72" diff --git a/utils/db_migration/versions/from_1_2_to_1_2-accuvant-add_statistics.py b/utils/db_migration/versions/from_1_2_to_1_2-accuvant-add_statistics.py index e22d33054b9..83e0b9bae1f 100644 --- a/utils/db_migration/versions/from_1_2_to_1_2-accuvant-add_statistics.py +++ b/utils/db_migration/versions/from_1_2_to_1_2-accuvant-add_statistics.py @@ -11,8 +11,6 @@ """ # revision identifiers, used by Alembic. -from __future__ import absolute_import, print_function - revision = "4b09c454108c" down_revision = "495d5a6edef3" diff --git a/utils/db_migration/versions/proper_indexes.py b/utils/db_migration/versions/proper_indexes.py index 991182aa9d0..1513e89b333 100644 --- a/utils/db_migration/versions/proper_indexes.py +++ b/utils/db_migration/versions/proper_indexes.py @@ -11,7 +11,6 @@ """ # revision identifiers, used by Alembic. -from __future__ import absolute_import, print_function import sys revision = "3c8bf4133b44" diff --git a/utils/db_migration_dist/env.py b/utils/db_migration_dist/env.py index 8e6082c93de..049d19393d1 100644 --- a/utils/db_migration_dist/env.py +++ b/utils/db_migration_dist/env.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, with_statement import os import sys from logging.config import fileConfig diff --git a/utils/dist.py b/utils/dist.py index dabcb404ad9..272c0e0afc7 100644 --- a/utils/dist.py +++ b/utils/dist.py @@ -5,7 +5,6 @@ # See the file 'docs/LICENSE' for copying permission. # ToDo # https://github.com/cuckoosandbox/cuckoo/pull/1694/files -from __future__ import absolute_import, print_function import argparse import distutils.util import hashlib diff --git a/utils/email_test.py b/utils/email_test.py index c34e824f622..ba59b90d030 100644 --- a/utils/email_test.py +++ b/utils/email_test.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import logging import os import smtplib diff --git a/utils/listdump.py b/utils/listdump.py index 9e3af9a59dd..701e8b6b846 100644 --- a/utils/listdump.py +++ b/utils/listdump.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import os import struct import sys diff --git a/utils/machine.py b/utils/machine.py index 027df6edb95..8ecdb6ffa85 100644 --- a/utils/machine.py +++ b/utils/machine.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import argparse import logging import os.path diff --git a/utils/process.py b/utils/process.py index 7ff3bf8a1e6..e1fba383adb 100644 --- a/utils/process.py +++ b/utils/process.py @@ -2,7 +2,6 @@ # Copyright (C) 2010-2015 Cuckoo Foundation. # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import argparse import gc import json diff --git a/utils/rooter.py b/utils/rooter.py index 3187ab95a81..9d3ce2f1ff9 100644 --- a/utils/rooter.py +++ b/utils/rooter.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import argparse import errno import grp diff --git a/utils/sample_path.py b/utils/sample_path.py index d49b480b954..29c23370fe0 100644 --- a/utils/sample_path.py +++ b/utils/sample_path.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import os import sys diff --git a/utils/smtp_sinkhole.py b/utils/smtp_sinkhole.py index a804c186a3b..b6b92482312 100644 --- a/utils/smtp_sinkhole.py +++ b/utils/smtp_sinkhole.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import argparse import asyncore import logging diff --git a/utils/submit.py b/utils/submit.py index b4291105232..d8aab38814d 100644 --- a/utils/submit.py +++ b/utils/submit.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import argparse import fnmatch import logging diff --git a/utils/tcpdumpwrapper.py b/utils/tcpdumpwrapper.py index e25e87a87e3..abfb682a9fb 100644 --- a/utils/tcpdumpwrapper.py +++ b/utils/tcpdumpwrapper.py @@ -4,7 +4,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import sys import time diff --git a/utils/test_suricata_signature.py b/utils/test_suricata_signature.py index 6f55dc673e0..19463c28d4a 100644 --- a/utils/test_suricata_signature.py +++ b/utils/test_suricata_signature.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import os import sys diff --git a/utils/tridupdate.py b/utils/tridupdate.py index 734991b892d..1a660ff34be 100644 --- a/utils/tridupdate.py +++ b/utils/tridupdate.py @@ -13,7 +13,6 @@ # -------------------------------------------------------------------------- -from __future__ import print_function import argparse import hashlib import os diff --git a/utils/vpncheck.py b/utils/vpncheck.py index ac090349f91..c0137520c0f 100644 --- a/utils/vpncheck.py +++ b/utils/vpncheck.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import argparse import fcntl import os diff --git a/utils/yara_test.py b/utils/yara_test.py index c6ded637dd0..9752374a19b 100644 --- a/utils/yara_test.py +++ b/utils/yara_test.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import logging import os import sys diff --git a/web/analysis/forms.py b/web/analysis/forms.py index 7e958d2ed57..315b44680d0 100644 --- a/web/analysis/forms.py +++ b/web/analysis/forms.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - from django import forms from submission.models import Comment, Tag diff --git a/web/analysis/templatetags/analysis_tags.py b/web/analysis/templatetags/analysis_tags.py index 87436562e76..11824164a15 100644 --- a/web/analysis/templatetags/analysis_tags.py +++ b/web/analysis/templatetags/analysis_tags.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import os from io import StringIO diff --git a/web/analysis/templatetags/generic_tags.py b/web/analysis/templatetags/generic_tags.py index c1802a99f82..60cc83d534e 100644 --- a/web/analysis/templatetags/generic_tags.py +++ b/web/analysis/templatetags/generic_tags.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from collections import deque from django.template.defaultfilters import register diff --git a/web/analysis/templatetags/key_tags.py b/web/analysis/templatetags/key_tags.py index a78e18b485a..3595f7d09c4 100644 --- a/web/analysis/templatetags/key_tags.py +++ b/web/analysis/templatetags/key_tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from django import template register = template.Library() diff --git a/web/analysis/templatetags/pdf_tags.py b/web/analysis/templatetags/pdf_tags.py index b1c01abe725..e62350c407a 100644 --- a/web/analysis/templatetags/pdf_tags.py +++ b/web/analysis/templatetags/pdf_tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from django import template register = template.Library() diff --git a/web/analysis/urls.py b/web/analysis/urls.py index dc518e00c8a..ef7809073a2 100644 --- a/web/analysis/urls.py +++ b/web/analysis/urls.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file "docs/LICENSE" for copying permission. -from __future__ import absolute_import - from analysis import views from django.urls import re_path diff --git a/web/analysis/views.py b/web/analysis/views.py index 22f0d08c175..cb402128663 100644 --- a/web/analysis/views.py +++ b/web/analysis/views.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import base64 import datetime import json diff --git a/web/apiv2/urls.py b/web/apiv2/urls.py index 5ea24acc9dd..a5a9943d11d 100644 --- a/web/apiv2/urls.py +++ b/web/apiv2/urls.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file "docs/LICENSE" for copying permission. -from __future__ import absolute_import - from apiv2 import views # from django.conf.urls import include diff --git a/web/apiv2/views.py b/web/apiv2/views.py index 3b02fd7be7b..4dc70552bbb 100644 --- a/web/apiv2/views.py +++ b/web/apiv2/views.py @@ -1,5 +1,4 @@ # encoding: utf-8 -from __future__ import absolute_import import json import logging import os diff --git a/web/compare/urls.py b/web/compare/urls.py index 607f0fde4ab..3b32527f6f1 100644 --- a/web/compare/urls.py +++ b/web/compare/urls.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file "docs/LICENSE" for copying permission. -from __future__ import absolute_import - from compare import views from django.urls import re_path diff --git a/web/compare/views.py b/web/compare/views.py index 66d54156cb5..94ee2626946 100644 --- a/web/compare/views.py +++ b/web/compare/views.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import sys from django.conf import settings diff --git a/web/dashboard/urls.py b/web/dashboard/urls.py index 2a75346a030..ff2e6b25406 100644 --- a/web/dashboard/urls.py +++ b/web/dashboard/urls.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file "docs/LICENSE" for copying permission. -from __future__ import absolute_import - from dashboard import views from django.urls import re_path diff --git a/web/dashboard/views.py b/web/dashboard/views.py index e63fd049b57..5593a98315e 100644 --- a/web/dashboard/views.py +++ b/web/dashboard/views.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import sys from django.conf import settings diff --git a/web/manage.py b/web/manage.py index 1403592dc3c..81232ff990b 100644 --- a/web/manage.py +++ b/web/manage.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import sys diff --git a/web/submission/urls.py b/web/submission/urls.py index dbcc5cad5ab..1ebedcae74d 100644 --- a/web/submission/urls.py +++ b/web/submission/urls.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - from django.urls import re_path from submission import views diff --git a/web/submission/views.py b/web/submission/views.py index 80944640a3a..83b2d3f91f9 100644 --- a/web/submission/views.py +++ b/web/submission/views.py @@ -3,7 +3,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import, print_function import logging import os import random diff --git a/web/web/asgi.py b/web/web/asgi.py index bec6520b746..962c2d6694d 100644 --- a/web/web/asgi.py +++ b/web/web/asgi.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - # Copyright (C) 2010-2015 Cuckoo Foundation. # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. diff --git a/web/web/headers.py b/web/web/headers.py index faca855f950..7cfdf477879 100644 --- a/web/web/headers.py +++ b/web/web/headers.py @@ -2,7 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import sys from django.conf import settings diff --git a/web/web/local_settings.py b/web/web/local_settings.py index f0439789351..a71043f65db 100644 --- a/web/web/local_settings.py +++ b/web/web/local_settings.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - LOCAL_SETTINGS = True from .settings import * diff --git a/web/web/settings.py b/web/web/settings.py index 63cd5f75670..882937f28b6 100644 --- a/web/web/settings.py +++ b/web/web/settings.py @@ -1,7 +1,6 @@ # Copyright (C) 2010-2015 Cuckoo Foundation. # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import import os import sys from pathlib import Path diff --git a/web/web/urls.py b/web/web/urls.py index 031fb654f9c..749d1451e55 100644 --- a/web/web/urls.py +++ b/web/web/urls.py @@ -2,8 +2,6 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -from __future__ import absolute_import - from analysis import views as analysis_views from dashboard import views as dashboard_views from django.conf import settings diff --git a/web/web/wsgi.py b/web/web/wsgi.py index ee8f8de6fcd..7ff95dfca03 100644 --- a/web/web/wsgi.py +++ b/web/web/wsgi.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - # Copyright (C) 2010-2015 Cuckoo Foundation. # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission.