diff --git a/CHANGELOG/changelog.py b/CHANGELOG/changelog.py index f1526bb4c32..18f3e9b2d65 100644 --- a/CHANGELOG/changelog.py +++ b/CHANGELOG/changelog.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import os import packaging.version diff --git a/doc/conf.py b/doc/conf.py index aed7670a2e5..cca9ea63dca 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -16,7 +16,6 @@ # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. # -from __future__ import absolute_import import os import sys sys.path.insert(0, os.path.abspath('..')) diff --git a/faraday/migrations/env.py b/faraday/migrations/env.py index 617f041f3d0..c71f1a3fcc5 100644 --- a/faraday/migrations/env.py +++ b/faraday/migrations/env.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import with_statement import logging import sys diff --git a/faraday/migrations/versions/085188e0a016_create_rules_tables.py b/faraday/migrations/versions/085188e0a016_create_rules_tables.py index 9ea93ee2374..9a0d2d26c81 100644 --- a/faraday/migrations/versions/085188e0a016_create_rules_tables.py +++ b/faraday/migrations/versions/085188e0a016_create_rules_tables.py @@ -5,7 +5,6 @@ Create Date: 2019-06-18 18:07:41.834191+00:00 """ -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/faraday/migrations/versions/0d216660da28_add_notification_table.py b/faraday/migrations/versions/0d216660da28_add_notification_table.py index cfd2941c17b..ddd1d3cffc9 100644 --- a/faraday/migrations/versions/0d216660da28_add_notification_table.py +++ b/faraday/migrations/versions/0d216660da28_add_notification_table.py @@ -5,7 +5,6 @@ Create Date: 2019-04-26 20:17:48.639684+00:00 """ -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/faraday/migrations/versions/1b2533cc16fe_fix_custom_fields_display_name_was_used_.py b/faraday/migrations/versions/1b2533cc16fe_fix_custom_fields_display_name_was_used_.py index 03d7ddd9704..d114e288b84 100644 --- a/faraday/migrations/versions/1b2533cc16fe_fix_custom_fields_display_name_was_used_.py +++ b/faraday/migrations/versions/1b2533cc16fe_fix_custom_fields_display_name_was_used_.py @@ -5,7 +5,6 @@ Create Date: 2019-04-05 16:19:11.216571+00:00 """ -from __future__ import absolute_import import json from alembic import op import sqlalchemy as sa diff --git a/faraday/migrations/versions/2ca03a8feef5_workspace_readonly.py b/faraday/migrations/versions/2ca03a8feef5_workspace_readonly.py index 5b57f94d448..981e3065109 100644 --- a/faraday/migrations/versions/2ca03a8feef5_workspace_readonly.py +++ b/faraday/migrations/versions/2ca03a8feef5_workspace_readonly.py @@ -5,7 +5,6 @@ Create Date: 2019-01-15 13:02:21.000699+00:00 """ -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/faraday/migrations/versions/2db31733fb78_unique_field_name_in_customfield.py b/faraday/migrations/versions/2db31733fb78_unique_field_name_in_customfield.py index eac2c6740cf..d4bf1e9e4f9 100644 --- a/faraday/migrations/versions/2db31733fb78_unique_field_name_in_customfield.py +++ b/faraday/migrations/versions/2db31733fb78_unique_field_name_in_customfield.py @@ -5,7 +5,6 @@ Create Date: 2019-05-15 18:48:41.909650+00:00 """ -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/faraday/migrations/versions/5272b3f5a820_add_markdown_column_to_exectuive_reports.py b/faraday/migrations/versions/5272b3f5a820_add_markdown_column_to_exectuive_reports.py index 6aaa4d614c8..8ae1df53fe2 100644 --- a/faraday/migrations/versions/5272b3f5a820_add_markdown_column_to_exectuive_reports.py +++ b/faraday/migrations/versions/5272b3f5a820_add_markdown_column_to_exectuive_reports.py @@ -5,7 +5,6 @@ Create Date: 2019-03-27 19:26:28.354078+00:00 """ -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/faraday/migrations/versions/59bed5515407_vuln_external_id.py b/faraday/migrations/versions/59bed5515407_vuln_external_id.py index 58a6492ffa1..64be052f167 100644 --- a/faraday/migrations/versions/59bed5515407_vuln_external_id.py +++ b/faraday/migrations/versions/59bed5515407_vuln_external_id.py @@ -5,7 +5,6 @@ Create Date: 2019-06-18 15:38:31.879725+00:00 """ -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/faraday/migrations/versions/8a10ff3926a5_2fa_columns.py b/faraday/migrations/versions/8a10ff3926a5_2fa_columns.py index a42240a4cdc..7c72ba97133 100644 --- a/faraday/migrations/versions/8a10ff3926a5_2fa_columns.py +++ b/faraday/migrations/versions/8a10ff3926a5_2fa_columns.py @@ -5,7 +5,6 @@ Create Date: 2018-11-29 16:34:44.081899+00:00 """ -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/faraday/migrations/versions/9c4091d1a09b_create_agent_table.py b/faraday/migrations/versions/9c4091d1a09b_create_agent_table.py index e86306a4386..e78a230dff9 100644 --- a/faraday/migrations/versions/9c4091d1a09b_create_agent_table.py +++ b/faraday/migrations/versions/9c4091d1a09b_create_agent_table.py @@ -5,7 +5,6 @@ Create Date: 2019-05-22 19:17:31.444968+00:00 """ -from __future__ import absolute_import import uuid from alembic import op diff --git a/faraday/migrations/versions/be89aa03e35e_add_severities_column_to_executive_.py b/faraday/migrations/versions/be89aa03e35e_add_severities_column_to_executive_.py index 0ded302f32e..b332534c6d3 100644 --- a/faraday/migrations/versions/be89aa03e35e_add_severities_column_to_executive_.py +++ b/faraday/migrations/versions/be89aa03e35e_add_severities_column_to_executive_.py @@ -5,7 +5,6 @@ Create Date: 2019-05-14 18:12:52.724079+00:00 """ -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/faraday/migrations/versions/e61afb450465_add_custom_fields.py b/faraday/migrations/versions/e61afb450465_add_custom_fields.py index d310f4e0c1d..fb75289d77d 100644 --- a/faraday/migrations/versions/e61afb450465_add_custom_fields.py +++ b/faraday/migrations/versions/e61afb450465_add_custom_fields.py @@ -5,7 +5,6 @@ Create Date: 2018-10-23 15:43:52.612619+00:00 """ -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/faraday/searcher/searcher.py b/faraday/searcher/searcher.py index c1f1fc2d99e..05dbf2505c0 100755 --- a/faraday/searcher/searcher.py +++ b/faraday/searcher/searcher.py @@ -6,9 +6,6 @@ ## Copyright (C) 2018 Infobyte LLC (http://www.infobytesec.com/) ## See the file 'doc/LICENSE' for the license information ### -from __future__ import absolute_import -from __future__ import print_function -from __future__ import division from builtins import str import ast diff --git a/faraday/searcher/sqlapi.py b/faraday/searcher/sqlapi.py index 7100407662c..e7b3b3751ac 100644 --- a/faraday/searcher/sqlapi.py +++ b/faraday/searcher/sqlapi.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import json import logging diff --git a/manage.py b/manage.py index bcc0a5479ba..e564d5483f7 100755 --- a/manage.py +++ b/manage.py @@ -5,9 +5,7 @@ # See the file 'doc/LICENSE' for the license information # Developers: the code for faraday-manage is located in faraday/manage.py -from __future__ import absolute_import -from __future__ import print_function import sys print( diff --git a/scripts/cscan/cscan.py b/scripts/cscan/cscan.py index 8003bc7acfc..7e1fa698070 100755 --- a/scripts/cscan/cscan.py +++ b/scripts/cscan/cscan.py @@ -5,7 +5,6 @@ ## See the file 'doc/LICENSE' for the license information ### -from __future__ import absolute_import from __future__ import print_function import subprocess import os diff --git a/scripts/cscan/plugin/carbonator/carbonator.py b/scripts/cscan/plugin/carbonator/carbonator.py index 77efa1d3117..16b6f972e3c 100644 --- a/scripts/cscan/plugin/carbonator/carbonator.py +++ b/scripts/cscan/plugin/carbonator/carbonator.py @@ -6,8 +6,6 @@ # # For more information contact us at carbonator at integrissecurity dot com # Or visit us at https://www.integrissecurity.com/ -from __future__ import absolute_import -from __future__ import print_function from burp import IBurpExtender from burp import IHttpListener diff --git a/scripts/cscan/plugin/msfrpc.py b/scripts/cscan/plugin/msfrpc.py index 462f0f4ef37..32e0b626273 100755 --- a/scripts/cscan/plugin/msfrpc.py +++ b/scripts/cscan/plugin/msfrpc.py @@ -6,8 +6,6 @@ ''' -from __future__ import absolute_import -from __future__ import print_function import os import time import string diff --git a/scripts/cscan/plugin/nessus.py b/scripts/cscan/plugin/nessus.py index b790997a7b6..ee7ee6d2f8b 100755 --- a/scripts/cscan/plugin/nessus.py +++ b/scripts/cscan/plugin/nessus.py @@ -4,8 +4,6 @@ ## Copyright (C) 2015 Infobyte LLC (http://www.infobytesec.com/) ## See the file 'doc/LICENSE' for the license information ### -from __future__ import absolute_import -from __future__ import print_function import requests import json import time diff --git a/scripts/cscan/plugin/w3af.py b/scripts/cscan/plugin/w3af.py index c5d94fc69b3..388b0e0dd80 100755 --- a/scripts/cscan/plugin/w3af.py +++ b/scripts/cscan/plugin/w3af.py @@ -4,8 +4,6 @@ # Copyright (C) 2015 Infobyte LLC (http://www.infobytesec.com/) # See the file 'doc/LICENSE' for the license information -from __future__ import absolute_import -from __future__ import print_function from w3af_api_client import Connection, Scan import subprocess diff --git a/scripts/cscan/plugin/zap.py b/scripts/cscan/plugin/zap.py index 4885a1c3e52..5393fb1a0a1 100755 --- a/scripts/cscan/plugin/zap.py +++ b/scripts/cscan/plugin/zap.py @@ -9,8 +9,6 @@ By tartamar ''' -from __future__ import absolute_import -from __future__ import print_function from builtins import input import argparse diff --git a/scripts/fix_vulnweb_without_service.py b/scripts/fix_vulnweb_without_service.py index 22418f74852..c228992e852 100644 --- a/scripts/fix_vulnweb_without_service.py +++ b/scripts/fix_vulnweb_without_service.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import print_function import faraday.server.config from faraday.server.models import ( Host, diff --git a/scripts/merge-conflict-detector.py b/scripts/merge-conflict-detector.py index b710cd55157..a7d69d05fb0 100644 --- a/scripts/merge-conflict-detector.py +++ b/scripts/merge-conflict-detector.py @@ -9,8 +9,6 @@ our propiertary code. Not useful if you don't have access to the code of Faraday Professional or Faraday Corporate ''' -from __future__ import absolute_import -from __future__ import print_function import os import re diff --git a/scripts/reposify/reposify.py b/scripts/reposify/reposify.py index 312d790361b..45860008cfd 100644 --- a/scripts/reposify/reposify.py +++ b/scripts/reposify/reposify.py @@ -5,8 +5,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import -from __future__ import print_function import sys import xmlrpc.client import argparse diff --git a/scripts/reposify/reposify_api.py b/scripts/reposify/reposify_api.py index 421d036a33a..99c16524c38 100644 --- a/scripts/reposify/reposify_api.py +++ b/scripts/reposify/reposify_api.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import requests import simplejson diff --git a/scripts/shodan_faraday.py b/scripts/shodan_faraday.py index bd5e96a60fe..1972e60a25b 100644 --- a/scripts/shodan_faraday.py +++ b/scripts/shodan_faraday.py @@ -5,8 +5,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import -from __future__ import print_function import shodan import sys diff --git a/scripts/sslcheck.py b/scripts/sslcheck.py index 71ef088f8e7..6f075f85e39 100755 --- a/scripts/sslcheck.py +++ b/scripts/sslcheck.py @@ -7,8 +7,6 @@ ''' #libraries -from __future__ import absolute_import -from __future__ import print_function import subprocess import argparse import re diff --git a/scripts/wcscan.py b/scripts/wcscan.py index 47173e5986a..2a13a6d4375 100755 --- a/scripts/wcscan.py +++ b/scripts/wcscan.py @@ -7,8 +7,6 @@ ''' -from __future__ import absolute_import -from __future__ import print_function import subprocess import argparse from lxml import etree as ET diff --git a/scripts/wcscans/phpini.py b/scripts/wcscans/phpini.py index df5915a20eb..aab5cced334 100644 --- a/scripts/wcscans/phpini.py +++ b/scripts/wcscans/phpini.py @@ -7,8 +7,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import print_function import re from lxml import etree as ET diff --git a/scripts/wcscans/webconfig.py b/scripts/wcscans/webconfig.py index 94ce8399b4e..734ada4d973 100644 --- a/scripts/wcscans/webconfig.py +++ b/scripts/wcscans/webconfig.py @@ -8,8 +8,6 @@ ''' -from __future__ import absolute_import -from __future__ import print_function from lxml import etree as ET rules = { diff --git a/setup.py b/setup.py index 5189bf45c93..3daefcaeb96 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,6 @@ https://packaging.python.org/en/latest/distributing.html https://github.com/pypa/sampleproject """ -from __future__ import absolute_import # Always prefer setuptools over distutils from setuptools import setup, find_packages diff --git a/tests/conftest.py b/tests/conftest.py index 1439f04e8f9..f4248aa432c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import from tempfile import NamedTemporaryFile diff --git a/tests/dont_run_but_update_updates.py b/tests/dont_run_but_update_updates.py index ec2575a83f6..fe4e933a6d2 100644 --- a/tests/dont_run_but_update_updates.py +++ b/tests/dont_run_but_update_updates.py @@ -5,7 +5,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import unittest import sys diff --git a/tests/factories.py b/tests/factories.py index 843dacdca0c..4fb9b23e179 100644 --- a/tests/factories.py +++ b/tests/factories.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import from builtins import chr, range import random diff --git a/tests/models/test_cascades.py b/tests/models/test_cascades.py index 0ebd29ae251..0749dcd0f23 100644 --- a/tests/models/test_cascades.py +++ b/tests/models/test_cascades.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import pytest from contextlib import contextmanager from faraday.server.models import ( diff --git a/tests/models/test_file.py b/tests/models/test_file.py index 16ba078bc83..f15cd6b3062 100644 --- a/tests/models/test_file.py +++ b/tests/models/test_file.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import os import pytest from faraday.server.models import File diff --git a/tests/models/test_host.py b/tests/models/test_host.py index c10b2a2e13e..549de2f737e 100644 --- a/tests/models/test_host.py +++ b/tests/models/test_host.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import random import pytest from functools import partial diff --git a/tests/models/test_tag.py b/tests/models/test_tag.py index 8096e823e37..b438f199a8d 100644 --- a/tests/models/test_tag.py +++ b/tests/models/test_tag.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import from faraday.server.models import TagObject diff --git a/tests/models/test_vulnerability.py b/tests/models/test_vulnerability.py index a92720126e4..fb7f29b733c 100644 --- a/tests/models/test_vulnerability.py +++ b/tests/models/test_vulnerability.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import pytest from faraday.server.models import ( CommandObject, diff --git a/tests/models/test_workspace.py b/tests/models/test_workspace.py index 62a86de660b..7f0cc54843c 100644 --- a/tests/models/test_workspace.py +++ b/tests/models/test_workspace.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import from faraday.server.models import db, Workspace from tests.factories import ( HostFactory, diff --git a/tests/test_api_activity_feed.py b/tests/test_api_activity_feed.py index 1492392df35..dc9c9a03d73 100644 --- a/tests/test_api_activity_feed.py +++ b/tests/test_api_activity_feed.py @@ -4,8 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import -from __future__ import division import os import pytest diff --git a/tests/test_api_agent.py b/tests/test_api_agent.py index d03300ddb12..bcb957e6a7f 100644 --- a/tests/test_api_agent.py +++ b/tests/test_api_agent.py @@ -3,7 +3,6 @@ Copyright (C) 2019 Infobyte LLC (http://www.infobytesec.com/) See the file 'doc/LICENSE' for the license information """ -from __future__ import absolute_import from unittest import mock import pytest diff --git a/tests/test_api_bulk_create.py b/tests/test_api_bulk_create.py index 0dfc61eeecd..d9680c66c23 100644 --- a/tests/test_api_bulk_create.py +++ b/tests/test_api_bulk_create.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from datetime import datetime, timedelta, timezone import pytest diff --git a/tests/test_api_commands.py b/tests/test_api_commands.py index 6edce308b7a..8f292f65933 100644 --- a/tests/test_api_commands.py +++ b/tests/test_api_commands.py @@ -5,7 +5,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import """Tests for many API endpoints that do not depend on workspace_name""" import datetime diff --git a/tests/test_api_comment.py b/tests/test_api_comment.py index 099525a3030..80d8397b058 100644 --- a/tests/test_api_comment.py +++ b/tests/test_api_comment.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import from faraday.server.api.modules.comments import CommentView from faraday.server.models import Comment diff --git a/tests/test_api_credentials.py b/tests/test_api_credentials.py index 5555f391fc8..bc463424035 100644 --- a/tests/test_api_credentials.py +++ b/tests/test_api_credentials.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import pytest diff --git a/tests/test_api_custom_fields.py b/tests/test_api_custom_fields.py index b474fde3df7..585fa1b79d6 100644 --- a/tests/test_api_custom_fields.py +++ b/tests/test_api_custom_fields.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import pytest diff --git a/tests/test_api_export_data.py b/tests/test_api_export_data.py index 462fd4254c6..72eb3ef8899 100644 --- a/tests/test_api_export_data.py +++ b/tests/test_api_export_data.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import os import pytest diff --git a/tests/test_api_get_exploits.py b/tests/test_api_get_exploits.py index 3799b368cd2..90f6348ef77 100644 --- a/tests/test_api_get_exploits.py +++ b/tests/test_api_get_exploits.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import pytest diff --git a/tests/test_api_hosts.py b/tests/test_api_hosts.py index c186aef6ead..4de7b83247d 100644 --- a/tests/test_api_hosts.py +++ b/tests/test_api_hosts.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import time import operator from io import BytesIO diff --git a/tests/test_api_info.py b/tests/test_api_info.py index 8d6003e2e26..7421b47cd27 100644 --- a/tests/test_api_info.py +++ b/tests/test_api_info.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import os import pytest diff --git a/tests/test_api_license.py b/tests/test_api_license.py index a624e752eda..15f7f01621d 100644 --- a/tests/test_api_license.py +++ b/tests/test_api_license.py @@ -5,7 +5,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import """Tests for many API endpoints that do not depend on workspace_name""" import pytest diff --git a/tests/test_api_login.py b/tests/test_api_login.py index 150b5fc0142..77a9effac69 100644 --- a/tests/test_api_login.py +++ b/tests/test_api_login.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import pytest from itsdangerous import TimedJSONWebSignatureSerializer diff --git a/tests/test_api_non_workspaced_base.py b/tests/test_api_non_workspaced_base.py index 1e5f8ecd297..9509fb400df 100644 --- a/tests/test_api_non_workspaced_base.py +++ b/tests/test_api_non_workspaced_base.py @@ -5,7 +5,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import from builtins import str """Generic tests for APIs NOT prefixed with a workspace_name""" diff --git a/tests/test_api_pagination.py b/tests/test_api_pagination.py index 3b5358f49d4..db0e2318daa 100644 --- a/tests/test_api_pagination.py +++ b/tests/test_api_pagination.py @@ -5,7 +5,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import """Generic test mixins for APIs with pagination enabled when listing""" diff --git a/tests/test_api_session.py b/tests/test_api_session.py index 068b8dd2dde..2c963b2d107 100644 --- a/tests/test_api_session.py +++ b/tests/test_api_session.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import pytest diff --git a/tests/test_api_upload_reports.py b/tests/test_api_upload_reports.py index 5e33d9e64ea..abc1f81ae2a 100644 --- a/tests/test_api_upload_reports.py +++ b/tests/test_api_upload_reports.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import os import pytest diff --git a/tests/test_api_vulnerability.py b/tests/test_api_vulnerability.py index 9ce8774bd0a..15c8e432358 100644 --- a/tests/test_api_vulnerability.py +++ b/tests/test_api_vulnerability.py @@ -5,7 +5,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import datetime from builtins import str diff --git a/tests/test_api_vulnerability_template.py b/tests/test_api_vulnerability_template.py index 00c4bc6c0e2..974b2500875 100644 --- a/tests/test_api_vulnerability_template.py +++ b/tests/test_api_vulnerability_template.py @@ -5,7 +5,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import os from io import BytesIO diff --git a/tests/test_api_websocket_auth.py b/tests/test_api_websocket_auth.py index b8186206745..6ab98dd213d 100644 --- a/tests/test_api_websocket_auth.py +++ b/tests/test_api_websocket_auth.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import from builtins import str import pytest diff --git a/tests/test_api_workspace.py b/tests/test_api_workspace.py index 8c8defbc746..8617a8a4d96 100644 --- a/tests/test_api_workspace.py +++ b/tests/test_api_workspace.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import time import pytest diff --git a/tests/test_api_workspaced_base.py b/tests/test_api_workspaced_base.py index e6e33e56b55..6c160e00eef 100644 --- a/tests/test_api_workspaced_base.py +++ b/tests/test_api_workspaced_base.py @@ -5,7 +5,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import from builtins import str """Generic tests for APIs prefixed with a workspace_name""" diff --git a/tests/test_common.py b/tests/test_common.py index 407d57d2ae0..18cbd5d386f 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -5,7 +5,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import from faraday.server.models import Host, Service, Vulnerability import random diff --git a/tests/test_faraday_manage.py b/tests/test_faraday_manage.py index 233b394b147..2ea6fdca079 100644 --- a/tests/test_faraday_manage.py +++ b/tests/test_faraday_manage.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import print_function import os import subprocess diff --git a/tests/test_marshmallow_fields.py b/tests/test_marshmallow_fields.py index 19473cd9c25..b09209f5263 100644 --- a/tests/test_marshmallow_fields.py +++ b/tests/test_marshmallow_fields.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import time import datetime diff --git a/tests/test_model_events.py b/tests/test_model_events.py index 1b56c6ad8e4..6ce20ed6cb3 100644 --- a/tests/test_model_events.py +++ b/tests/test_model_events.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import pytest from tests.factories import HostFactory, ServiceFactory diff --git a/tests/test_model_fields.py b/tests/test_model_fields.py index 89a45a7d397..eae378f3abc 100644 --- a/tests/test_model_fields.py +++ b/tests/test_model_fields.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import os diff --git a/tests/test_python_config_imports.py b/tests/test_python_config_imports.py index 93c590db28a..43b9ba9a97b 100644 --- a/tests/test_python_config_imports.py +++ b/tests/test_python_config_imports.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import unittest diff --git a/tests/test_searcher.py b/tests/test_searcher.py index ef954edf95a..2f9dd03c6ba 100644 --- a/tests/test_searcher.py +++ b/tests/test_searcher.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import json diff --git a/tests/test_server.py b/tests/test_server.py index 5fae888d062..fb9ef95cb7d 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import os import sys diff --git a/tests/test_server_config.py b/tests/test_server_config.py index 598d252f4d8..ca1bbe1f08b 100644 --- a/tests/test_server_config.py +++ b/tests/test_server_config.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import re import random import string diff --git a/tests/test_utils_database.py b/tests/test_utils_database.py index e266fabb8ab..e2aa0faf5d6 100644 --- a/tests/test_utils_database.py +++ b/tests/test_utils_database.py @@ -4,7 +4,6 @@ See the file 'doc/LICENSE' for the license information ''' -from __future__ import absolute_import import pytest diff --git a/tests/test_websocket_BroadcastServerProtocol.py b/tests/test_websocket_BroadcastServerProtocol.py index 7b4e852ae36..faae7bbe576 100644 --- a/tests/test_websocket_BroadcastServerProtocol.py +++ b/tests/test_websocket_BroadcastServerProtocol.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import pytest from faraday.server.models import Agent, Executor