From e555d994ef842ae0beace43e80fb95238537a932 Mon Sep 17 00:00:00 2001 From: Timi Fasubaa Date: Fri, 5 Oct 2018 20:13:20 -0700 Subject: [PATCH] remove future imports --- requirements-dev.txt | 1 - superset/cli.py | 5 ----- superset/data/__init__.py | 5 ----- superset/utils.py | 5 ----- tests/access_tests.py | 5 ----- tests/base_tests.py | 5 ----- tests/cache_tests.py | 5 ----- tests/celery_tests.py | 5 ----- tests/core_tests.py | 5 ----- tests/dashboard_tests.py | 5 ----- tests/dataframe_test.py | 5 ----- tests/datasource_tests.py | 5 ----- tests/db_engine_specs_test.py | 5 ----- tests/dict_import_export_tests.py | 6 ------ tests/druid_func_tests.py | 5 ----- tests/druid_tests.py | 5 ----- tests/email_tests.py | 5 ----- tests/fixtures/datasource.py | 5 ----- tests/form_tests.py | 5 ----- tests/import_export_tests.py | 5 ----- tests/macro_tests.py | 5 ----- tests/model_tests.py | 5 ----- tests/security_tests.py | 5 ----- tests/sql_parse_tests.py | 5 ----- tests/sqllab_tests.py | 5 ----- tests/utils.py | 5 ----- tests/utils_tests.py | 5 ----- tests/viz_tests.py | 5 ----- 28 files changed, 137 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 0c3ea6b5ca42c..3226807ccb384 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,6 @@ console_log==0.2.10 flake8-coding==1.3.0 flake8-commas==2.0.0 -flake8-future-import==0.4.5 flake8-import-order==0.18 flake8-quotes==1.0.0 flake8==3.5.0 diff --git a/superset/cli.py b/superset/cli.py index 6183601d02536..25de0b70de607 100755 --- a/superset/cli.py +++ b/superset/cli.py @@ -1,11 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # pylint: disable=C,R,W -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from datetime import datetime import logging from subprocess import Popen diff --git a/superset/data/__init__.py b/superset/data/__init__.py index 56af4a6423b98..945efb5732643 100644 --- a/superset/data/__init__.py +++ b/superset/data/__init__.py @@ -1,10 +1,5 @@ """Loads datasets, dashboards and slices in a new superset instance""" # pylint: disable=C,R,W -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import datetime import gzip import json diff --git a/superset/utils.py b/superset/utils.py index 636271206d51f..aa802098f1638 100644 --- a/superset/utils.py +++ b/superset/utils.py @@ -1,11 +1,6 @@ # -*- coding: utf-8 -*- # pylint: disable=C,R,W """Utility functions used across Superset""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from builtins import object from datetime import date, datetime, time, timedelta import decimal diff --git a/tests/access_tests.py b/tests/access_tests.py index a669f5dec5937..a9dc27d442f1b 100644 --- a/tests/access_tests.py +++ b/tests/access_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for Superset""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import json import unittest diff --git a/tests/base_tests.py b/tests/base_tests.py index f69ab68381465..990f78dc801dd 100644 --- a/tests/base_tests.py +++ b/tests/base_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for Superset""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import json import logging import os diff --git a/tests/cache_tests.py b/tests/cache_tests.py index 27a2c5f2566e5..5b4f50322de12 100644 --- a/tests/cache_tests.py +++ b/tests/cache_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for Superset with caching""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import json from superset import cache, db, utils diff --git a/tests/celery_tests.py b/tests/celery_tests.py index 06b10031cd1b9..935c75b162bbe 100644 --- a/tests/celery_tests.py +++ b/tests/celery_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for Superset Celery worker""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import json import subprocess import time diff --git a/tests/core_tests.py b/tests/core_tests.py index d922953e845ea..ce137a7548a9e 100644 --- a/tests/core_tests.py +++ b/tests/core_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for Superset""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import csv import datetime import doctest diff --git a/tests/dashboard_tests.py b/tests/dashboard_tests.py index bc6c61f5b2d32..b455ef229552c 100644 --- a/tests/dashboard_tests.py +++ b/tests/dashboard_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for Superset""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import json import unittest diff --git a/tests/dataframe_test.py b/tests/dataframe_test.py index b52b9508abb2e..2ffd4ce9c0b6d 100644 --- a/tests/dataframe_test.py +++ b/tests/dataframe_test.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import numpy as np from superset.dataframe import dedup, SupersetDataFrame diff --git a/tests/datasource_tests.py b/tests/datasource_tests.py index 7da7d929f5ddd..24aa430ab0714 100644 --- a/tests/datasource_tests.py +++ b/tests/datasource_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for Superset""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import json from .base_tests import SupersetTestCase diff --git a/tests/db_engine_specs_test.py b/tests/db_engine_specs_test.py index 81709dc67b4ed..cbcb1296e3049 100644 --- a/tests/db_engine_specs_test.py +++ b/tests/db_engine_specs_test.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import inspect from six import text_type diff --git a/tests/dict_import_export_tests.py b/tests/dict_import_export_tests.py index c96ce63652c7e..1f8ea64a79ecd 100644 --- a/tests/dict_import_export_tests.py +++ b/tests/dict_import_export_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for Superset""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import json import unittest @@ -25,7 +20,6 @@ class DictImportExportTests(SupersetTestCase): """Testing export import functionality for dashboards""" - def __init__(self, *args, **kwargs): super(DictImportExportTests, self).__init__(*args, **kwargs) diff --git a/tests/druid_func_tests.py b/tests/druid_func_tests.py index 64543a8edb098..2724f59ef4688 100644 --- a/tests/druid_func_tests.py +++ b/tests/druid_func_tests.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import json import unittest diff --git a/tests/druid_tests.py b/tests/druid_tests.py index 00df0f8ea6188..9fa75fb6dec9f 100644 --- a/tests/druid_tests.py +++ b/tests/druid_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for Superset""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from datetime import datetime import json import unittest diff --git a/tests/email_tests.py b/tests/email_tests.py index 3ee9f3ebf22d7..219540af7bcb0 100644 --- a/tests/email_tests.py +++ b/tests/email_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for email service in Superset""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from email.mime.application import MIMEApplication from email.mime.multipart import MIMEMultipart import logging diff --git a/tests/fixtures/datasource.py b/tests/fixtures/datasource.py index 647166f9ce418..b6d8c6784a853 100644 --- a/tests/fixtures/datasource.py +++ b/tests/fixtures/datasource.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Fixtures for test_datasource.py""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - datasource_post = { 'id': None, 'column_formats': {'ratio': '.2%'}, diff --git a/tests/form_tests.py b/tests/form_tests.py index 93bef66bcdba4..f77a725bf32e3 100644 --- a/tests/form_tests.py +++ b/tests/form_tests.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from wtforms.form import Form from superset.forms import ( diff --git a/tests/import_export_tests.py b/tests/import_export_tests.py index 3a3d5f93ae73b..aa025cd3ed2e5 100644 --- a/tests/import_export_tests.py +++ b/tests/import_export_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for Superset""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import json import unittest diff --git a/tests/macro_tests.py b/tests/macro_tests.py index 8c887acad1b82..c18b028d674eb 100644 --- a/tests/macro_tests.py +++ b/tests/macro_tests.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from flask import json from superset import app diff --git a/tests/model_tests.py b/tests/model_tests.py index 1a78567964c27..8e80c6a3f8a12 100644 --- a/tests/model_tests.py +++ b/tests/model_tests.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import textwrap from sqlalchemy.engine.url import make_url diff --git a/tests/security_tests.py b/tests/security_tests.py index fe7564ed14a69..ceedb40d42697 100644 --- a/tests/security_tests.py +++ b/tests/security_tests.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from superset import app, security_manager from .base_tests import SupersetTestCase diff --git a/tests/sql_parse_tests.py b/tests/sql_parse_tests.py index 3f66fedb434e2..f08d3e7cd1813 100644 --- a/tests/sql_parse_tests.py +++ b/tests/sql_parse_tests.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import unittest from superset import sql_parse diff --git a/tests/sqllab_tests.py b/tests/sqllab_tests.py index a39643aa60fb0..228abc74f5c22 100644 --- a/tests/sqllab_tests.py +++ b/tests/sqllab_tests.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Unit tests for Sql Lab""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from datetime import datetime, timedelta import json import unittest diff --git a/tests/utils.py b/tests/utils.py index d1a5adb01febb..8aeef463d4ee5 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import json from os import path diff --git a/tests/utils_tests.py b/tests/utils_tests.py index eb164b8b1aeac..9646ffa0fdd9a 100644 --- a/tests/utils_tests.py +++ b/tests/utils_tests.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from datetime import date, datetime, time, timedelta from decimal import Decimal import unittest diff --git a/tests/viz_tests.py b/tests/viz_tests.py index da7c02f94094f..7325792d68735 100644 --- a/tests/viz_tests.py +++ b/tests/viz_tests.py @@ -1,9 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from datetime import datetime import uuid