diff --git a/superset/commands/dataset/importers/v1/utils.py b/superset/commands/dataset/importers/v1/utils.py index c145cc50f..5a9ac5471 100644 --- a/superset/commands/dataset/importers/v1/utils.py +++ b/superset/commands/dataset/importers/v1/utils.py @@ -24,8 +24,8 @@ from urllib import request import pandas as pd from flask import current_app, g from sqlalchemy import BigInteger, Boolean, Date, DateTime, Float, String, Text +from sqlalchemy.exc import MultipleResultsFound from sqlalchemy.orm import Session -from sqlalchemy.orm.exc import MultipleResultsFound from sqlalchemy.sql.visitors import VisitableType from superset import security_manager diff --git a/superset/commands/importers/v1/examples.py b/superset/commands/importers/v1/examples.py index 94194921a..87280033e 100644 --- a/superset/commands/importers/v1/examples.py +++ b/superset/commands/importers/v1/examples.py @@ -17,8 +17,8 @@ from typing import Any from marshmallow import Schema +from sqlalchemy.exc import MultipleResultsFound from sqlalchemy.orm import Session -from sqlalchemy.orm.exc import MultipleResultsFound from sqlalchemy.sql import select from superset import db diff --git a/superset/models/helpers.py b/superset/models/helpers.py index 3e88bec44..d64b9036a 100644 --- a/superset/models/helpers.py +++ b/superset/models/helpers.py @@ -44,9 +44,9 @@ from flask_appbuilder.security.sqla.models import User from flask_babel import lazy_gettext as _ from jinja2.exceptions import TemplateError from sqlalchemy import and_, Column, or_, UniqueConstraint +from sqlalchemy.exc import MultipleResultsFound from sqlalchemy.ext.declarative import declared_attr from sqlalchemy.orm import Mapper, Session, validates -from sqlalchemy.orm.exc import MultipleResultsFound from sqlalchemy.sql.elements import ColumnElement, literal_column, TextClause from sqlalchemy.sql.expression import Label, Select, TextAsFrom from sqlalchemy.sql.selectable import Alias, TableClause diff --git a/superset/views/base_schemas.py b/superset/views/base_schemas.py index 5e423bde9..0ad85f0ce 100644 --- a/superset/views/base_schemas.py +++ b/superset/views/base_schemas.py @@ -20,7 +20,7 @@ from typing import Any, Optional, Union from flask import current_app, g from flask_appbuilder import Model from marshmallow import post_load, pre_load, Schema, ValidationError -from sqlalchemy.orm.exc import NoResultFound +from sqlalchemy.exc import NoResultFound from superset.utils.core import get_user_id diff --git a/superset/views/datasource/views.py b/superset/views/datasource/views.py index a4c158a11..b911d2ea3 100644 --- a/superset/views/datasource/views.py +++ b/superset/views/datasource/views.py @@ -24,8 +24,7 @@ from flask_appbuilder.api import rison from flask_appbuilder.security.decorators import has_access, has_access_api from flask_babel import _ from marshmallow import ValidationError -from sqlalchemy.exc import NoSuchTableError -from sqlalchemy.orm.exc import NoResultFound +from sqlalchemy.exc import NoResultFound, NoSuchTableError from superset import db, event_logger, security_manager from superset.commands.dataset.exceptions import ( diff --git a/superset/views/utils.py b/superset/views/utils.py index 7c2518119..db5b3b534 100644 --- a/superset/views/utils.py +++ b/superset/views/utils.py @@ -28,7 +28,7 @@ from flask import flash, g, has_request_context, redirect, request from flask_appbuilder.security.sqla import models as ab_models from flask_appbuilder.security.sqla.models import User from flask_babel import _ -from sqlalchemy.orm.exc import NoResultFound +from sqlalchemy.exc import NoResultFound from werkzeug.wrappers.response import Response import superset.models.core as models