Remove __future__ imports

They were used during the migrating to Python 3. Now that we're using Python 3.7, there is no need of using them (unless we do `from __future__ import annotations` which will be introduced in Python 4, but we don't use it).
infobyte · May 6, 2020 · 4be61fa · 4be61fa
1 parent f65f24d
commit 4be61fa
Show file tree

Hide file tree

Showing 75 changed files with 0 additions and 94 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 
 import json
 import logging

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 
 import pytest