Skip to content

Commit

Permalink
[flake8] Resolve I??? errors (#3797)
Browse files Browse the repository at this point in the history
  • Loading branch information
john-bodley authored and mistercrunch committed Nov 8, 2017
1 parent 7987cb7 commit e2bca47
Show file tree
Hide file tree
Showing 45 changed files with 214 additions and 259 deletions.
3 changes: 2 additions & 1 deletion scripts/permissions_cleanup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from superset import sm
from collections import defaultdict

from superset import sm


def cleanup_permissions():
# 1. Clean up duplicates.
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import json
import os
import subprocess
import json
from setuptools import setup, find_packages

from setuptools import find_packages, setup

BASE_DIR = os.path.abspath(os.path.dirname(__file__))
PACKAGE_DIR = os.path.join(BASE_DIR, 'superset', 'static', 'assets')
Expand Down
5 changes: 2 additions & 3 deletions superset/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
from __future__ import print_function
from __future__ import unicode_literals

import json
import logging
from logging.handlers import TimedRotatingFileHandler

import json
import os

from flask import Flask, redirect
from flask_appbuilder import SQLA, AppBuilder, IndexView
from flask_appbuilder import AppBuilder, IndexView, SQLA
from flask_appbuilder.baseviews import expose
from flask_migrate import Migrate
from flask_wtf.csrf import CSRFProtect
Expand Down
3 changes: 2 additions & 1 deletion superset/cache_util.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from superset import tables_cache
from flask import request

from superset import tables_cache


def view_cache_key(*unused_args, **unused_kwargs):
args_hash = hash(frozenset(request.args.items()))
Expand Down
2 changes: 1 addition & 1 deletion superset/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from __future__ import print_function
from __future__ import unicode_literals

import logging
from datetime import datetime
import logging
from subprocess import Popen

from colorama import Fore, Style
Expand Down
2 changes: 1 addition & 1 deletion superset/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
from __future__ import print_function
from __future__ import unicode_literals

from collections import OrderedDict
import imp
import json
import os
import sys
from collections import OrderedDict

from dateutil import tz
from flask_appbuilder.security.manager import AUTH_DB
Expand Down
4 changes: 2 additions & 2 deletions superset/connectors/base/models.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import json

from sqlalchemy import (
and_, Column, Integer, String, Text, Boolean,
and_, Boolean, Column, Integer, String, Text,
)
from sqlalchemy.orm import foreign, relationship
from sqlalchemy.ext.declarative import declared_attr
from sqlalchemy.orm import foreign, relationship

from superset import utils
from superset.models.core import Slice
Expand Down
5 changes: 3 additions & 2 deletions superset/connectors/base/views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from superset.views.base import SupersetModelView
from superset.utils import SupersetException
from flask import Markup

from superset.utils import SupersetException
from superset.views.base import SupersetModelView


class DatasourceModelView(SupersetModelView):
def pre_delete(self, obj):
Expand Down
44 changes: 20 additions & 24 deletions superset/connectors/druid/models.py
Original file line number Diff line number Diff line change
@@ -1,41 +1,37 @@
# pylint: disable=invalid-unary-operand-type
from collections import OrderedDict
import json
import logging
from copy import deepcopy
from datetime import datetime, timedelta
from six import string_types
import json
import logging
from multiprocessing import Pool

import requests
import sqlalchemy as sa
from sqlalchemy import (
Column, Integer, String, ForeignKey, Text, Boolean,
DateTime, or_,
)
from sqlalchemy.orm import backref, relationship
from dateutil.parser import parse as dparse

from flask import escape, Markup
from flask_appbuilder import Model
from flask_appbuilder.models.decorators import renders
from flask_babel import lazy_gettext as _
from pydruid.client import PyDruid
from pydruid.utils.aggregators import count
from pydruid.utils.filters import Dimension, Filter, Bound
from pydruid.utils.filters import Bound, Dimension, Filter
from pydruid.utils.having import Aggregation
from pydruid.utils.postaggregator import (
Postaggregator, Quantile, Quantiles, Field, Const, HyperUniqueCardinality,
Const, Field, HyperUniqueCardinality, Postaggregator, Quantile, Quantiles,
)
from pydruid.utils.having import Aggregation

from flask import Markup, escape
from flask_appbuilder.models.decorators import renders
from flask_appbuilder import Model

from flask_babel import lazy_gettext as _
import requests
from six import string_types
import sqlalchemy as sa
from sqlalchemy import (
Boolean, Column, DateTime, ForeignKey, Integer, or_, String, Text,
)
from sqlalchemy.orm import backref, relationship

from superset import conf, db, import_util, utils, sm
from superset import conf, db, import_util, sm, utils
from superset.connectors.base.models import BaseColumn, BaseDatasource, BaseMetric
from superset.models.helpers import AuditMixinNullable, QueryResult, set_perm
from superset.utils import (
flasher, MetricPermException, DimSelector, DTTM_ALIAS
DimSelector, DTTM_ALIAS, flasher, MetricPermException,
)
from superset.connectors.base.models import BaseDatasource, BaseColumn, BaseMetric
from superset.models.helpers import AuditMixinNullable, QueryResult, set_perm

DRUID_TZ = conf.get("DRUID_TZ")

Expand Down
17 changes: 8 additions & 9 deletions superset/connectors/druid/views.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
from datetime import datetime
import logging

from flask import Markup, flash, redirect
from flask import flash, Markup, redirect
from flask_appbuilder import CompactCRUDMixin, expose
from flask_appbuilder.models.sqla.interface import SQLAInterface

from flask_babel import lazy_gettext as _
from flask_babel import gettext as __
from flask_babel import lazy_gettext as _

from superset import db, utils, appbuilder, sm, security
from superset import appbuilder, db, security, sm, utils
from superset.connectors.base.views import DatasourceModelView
from superset.connectors.connector_registry import ConnectorRegistry
from superset.utils import has_access
from superset.connectors.base.views import DatasourceModelView
from superset.views.base import (
BaseSupersetView,
SupersetModelView, validate_json, DeleteMixin, ListWidgetWithCheckboxes,
DatasourceFilter, get_datasource_exist_error_mgs)

BaseSupersetView, DatasourceFilter, DeleteMixin,
get_datasource_exist_error_mgs, ListWidgetWithCheckboxes, SupersetModelView,
validate_json
)
from . import models


Expand Down
33 changes: 15 additions & 18 deletions superset/connectors/sqla/models.py
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
from datetime import datetime
import logging
import sqlparse
from past.builtins import basestring

from flask import escape, Markup
from flask_appbuilder import Model
from flask_babel import lazy_gettext as _
import pandas as pd

from past.builtins import basestring
import sqlalchemy as sa
from sqlalchemy import (
Column, Integer, String, ForeignKey, Text, Boolean,
DateTime,
and_, asc, Boolean, Column, DateTime, desc, ForeignKey, Integer, or_,
select, String, Text,
)
import sqlalchemy as sa
from sqlalchemy import asc, and_, desc, select, or_
from sqlalchemy.sql.expression import TextAsFrom
from sqlalchemy.orm import backref, relationship
from sqlalchemy.sql import table, literal_column, text, column

from flask import escape, Markup
from flask_appbuilder import Model
from flask_babel import lazy_gettext as _
from sqlalchemy.sql import column, literal_column, table, text
from sqlalchemy.sql.expression import TextAsFrom
import sqlparse

from superset import db, utils, import_util, sm
from superset.connectors.base.models import BaseDatasource, BaseColumn, BaseMetric
from superset.utils import DTTM_ALIAS, QueryStatus
from superset.models.helpers import QueryResult
from superset.models.core import Database
from superset import db, import_util, sm, utils
from superset.connectors.base.models import BaseColumn, BaseDatasource, BaseMetric
from superset.jinja_context import get_template_processor
from superset.models.core import Database
from superset.models.helpers import QueryResult
from superset.models.helpers import set_perm
from superset.utils import DTTM_ALIAS, QueryStatus


class TableColumn(Model, BaseColumn):
Expand Down
17 changes: 7 additions & 10 deletions superset/connectors/sqla/views.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
"""Views used by the SqlAlchemy connector"""
from past.builtins import basestring

from flask import Markup, flash, redirect
from flask import flash, Markup, redirect
from flask_appbuilder import CompactCRUDMixin, expose
from flask_appbuilder.actions import action
from flask_appbuilder.models.sqla.interface import SQLAInterface

from flask_babel import lazy_gettext as _
from flask_babel import gettext as __
from flask_babel import lazy_gettext as _
from past.builtins import basestring

from superset import appbuilder, db, utils, security, sm
from superset.utils import has_access
from superset import appbuilder, db, security, sm, utils
from superset.connectors.base.views import DatasourceModelView
from superset.utils import has_access
from superset.views.base import (
SupersetModelView, ListWidgetWithCheckboxes, DeleteMixin, DatasourceFilter,
get_datasource_exist_error_mgs,
DatasourceFilter, DeleteMixin, get_datasource_exist_error_mgs,
ListWidgetWithCheckboxes, SupersetModelView,
)

from . import models


Expand Down
9 changes: 4 additions & 5 deletions superset/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,21 @@
from __future__ import print_function
from __future__ import unicode_literals

import datetime
import gzip
import json
import os
import textwrap
import datetime
import random
import textwrap

import pandas as pd
from sqlalchemy import String, DateTime, Date, Float, BigInteger
from sqlalchemy import BigInteger, Date, DateTime, Float, String

from superset import app, db, utils
from superset.connectors.connector_registry import ConnectorRegistry
from superset.models import core as models
from superset.security import get_or_create_main_db

from superset.connectors.connector_registry import ConnectorRegistry

# Shortcuts
DB = models.Database
Slice = models.Slice
Expand Down
7 changes: 3 additions & 4 deletions superset/dataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
from __future__ import print_function
from __future__ import unicode_literals

from datetime import datetime, date
from past.builtins import basestring
from datetime import date, datetime

import numpy as np
import pandas as pd
from pandas.core.dtypes.dtypes import ExtensionDtype

import numpy as np
from past.builtins import basestring


INFER_COL_TYPES_THRESHOLD = 95
Expand Down
15 changes: 6 additions & 9 deletions superset/db_engine_specs.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,21 @@
from __future__ import print_function
from __future__ import unicode_literals

from collections import namedtuple, defaultdict

from collections import defaultdict, namedtuple
import inspect
import logging
import re
import textwrap
import time

import sqlparse
from sqlalchemy import select
from sqlalchemy.sql import text
from flask_babel import lazy_gettext as _

from sqlalchemy import select
from sqlalchemy.engine.url import make_url
from sqlalchemy.sql import text
import sqlparse

from superset.utils import SupersetTemplateException
from superset.utils import QueryStatus
from superset import conf, cache_util, utils
from superset import cache_util, conf, utils
from superset.utils import QueryStatus, SupersetTemplateException

tracking_url_trans = conf.get('TRACKING_URL_TRANSFORMER')

Expand Down
4 changes: 2 additions & 2 deletions superset/extract_table_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# http://groups.google.com/group/sqlparse/browse_thread/thread/b0bd9a022e9d4895

import sqlparse
from sqlparse.sql import IdentifierList, Identifier
from sqlparse.tokens import Keyword, DML
from sqlparse.sql import Identifier, IdentifierList
from sqlparse.tokens import DML, Keyword


def is_subselect(parsed):
Expand Down
1 change: 1 addition & 0 deletions superset/import_util.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import logging

from sqlalchemy.orm.session import make_transient


Expand Down
5 changes: 2 additions & 3 deletions superset/jinja_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
import time
import uuid

from jinja2.sandbox import SandboxedEnvironment
from flask import request, g

from dateutil.relativedelta import relativedelta
from flask import g, request
from jinja2.sandbox import SandboxedEnvironment

from superset import app

Expand Down
1 change: 1 addition & 0 deletions superset/legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from __future__ import unicode_literals

import re

from superset import frontend_config

FORM_DATA_KEY_WHITELIST = list(frontend_config.get('controls').keys()) + ['slice_id']
Expand Down
5 changes: 2 additions & 3 deletions superset/models/annotations.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
from __future__ import print_function
from __future__ import unicode_literals

from flask_appbuilder import Model
from sqlalchemy import (
Column, Integer, String, ForeignKey, Text,
DateTime, Index,
Column, DateTime, ForeignKey, Index, Integer, String, Text,
)
from sqlalchemy.orm import relationship
from flask_appbuilder import Model

from superset.models.helpers import AuditMixinNullable

Expand Down
Loading

0 comments on commit e2bca47

Please sign in to comment.