summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/dialects/mssql/base.py2
-rw-r--r--lib/sqlalchemy/dialects/mysql/types.py2
-rw-r--r--lib/sqlalchemy/engine/interfaces.py6
-rw-r--r--lib/sqlalchemy/ext/asyncio/result.py5
-rw-r--r--lib/sqlalchemy/orm/interfaces.py1
-rw-r--r--lib/sqlalchemy/orm/relationships.py3
-rw-r--r--lib/sqlalchemy/orm/strategy_options.py3
-rw-r--r--lib/sqlalchemy/sql/elements.py5
-rw-r--r--lib/sqlalchemy/sql/roles.py2
-rw-r--r--lib/sqlalchemy/testing/suite/test_types.py2
10 files changed, 19 insertions, 12 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index e59221f83..750f3743b 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -1740,7 +1740,7 @@ class MSSQLCompiler(compiler.SQLCompiler):
)
def get_select_precolumns(self, select, **kw):
- """ MS-SQL puts TOP, it's version of LIMIT here """
+ """MS-SQL puts TOP, it's version of LIMIT here"""
s = super(MSSQLCompiler, self).get_select_precolumns(select, **kw)
diff --git a/lib/sqlalchemy/dialects/mysql/types.py b/lib/sqlalchemy/dialects/mysql/types.py
index 9a6b804b3..3318006e6 100644
--- a/lib/sqlalchemy/dialects/mysql/types.py
+++ b/lib/sqlalchemy/dialects/mysql/types.py
@@ -395,7 +395,7 @@ class BIT(sqltypes.TypeEngine):
class TIME(sqltypes.TIME):
- """MySQL TIME type. """
+ """MySQL TIME type."""
__visit_name__ = "TIME"
diff --git a/lib/sqlalchemy/engine/interfaces.py b/lib/sqlalchemy/engine/interfaces.py
index 47348ba76..0df7c954e 100644
--- a/lib/sqlalchemy/engine/interfaces.py
+++ b/lib/sqlalchemy/engine/interfaces.py
@@ -14,6 +14,7 @@ from ..util import compat
if compat.TYPE_CHECKING:
from typing import Any
+
from .url import URL
@@ -1559,8 +1560,9 @@ class Connectable(object):
"""
def execute(self, object_, *multiparams, **params):
- """Executes the given construct and returns a """
- """:class:`_engine.CursorResult`."""
+ """Executes the given construct and returns a
+ :class:`_engine.CursorResult`.
+ """
raise NotImplementedError()
def scalar(self, object_, *multiparams, **params):
diff --git a/lib/sqlalchemy/ext/asyncio/result.py b/lib/sqlalchemy/ext/asyncio/result.py
index c299dafc9..6899fe0a6 100644
--- a/lib/sqlalchemy/ext/asyncio/result.py
+++ b/lib/sqlalchemy/ext/asyncio/result.py
@@ -16,11 +16,12 @@ from ...util.concurrency import greenlet_spawn
if util.TYPE_CHECKING:
from typing import Any
- from typing import List
- from typing import Optional
from typing import Int
from typing import Iterator
+ from typing import List
from typing import Mapping
+ from typing import Optional
+
from ...engine.result import Row
diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py
index 6f77fd706..68e1aa5cb 100644
--- a/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@ -45,6 +45,7 @@ if util.TYPE_CHECKING:
from typing import Any
from typing import List
from typing import Optional
+
from .mapper import Mapper
from .util import AliasedInsp
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py
index 2ed9d859a..bf166e181 100644
--- a/lib/sqlalchemy/orm/relationships.py
+++ b/lib/sqlalchemy/orm/relationships.py
@@ -51,9 +51,10 @@ from ..sql.util import visit_binary_product
if util.TYPE_CHECKING:
- from .util import AliasedInsp
from typing import Union
+ from .util import AliasedInsp
+
def remote(expr):
"""Annotate a portion of a primaryjoin expression
diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
index f61cf835d..60ae69176 100644
--- a/lib/sqlalchemy/orm/strategy_options.py
+++ b/lib/sqlalchemy/orm/strategy_options.py
@@ -33,8 +33,9 @@ from ..sql.base import _generative
from ..sql.base import Generative
if util.TYPE_CHECKING:
- from .context import QueryContext
from typing import Sequence
+
+ from .context import QueryContext
from ..sql.elements import ColumnElement
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index cdb1dbca8..169a6d846 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -450,8 +450,9 @@ class ClauseElement(
return self
def _ungroup(self):
- """Return this :class:`_expression.ClauseElement` """
- """without any groupings."""
+ """Return this :class:`_expression.ClauseElement`
+ without any groupings.
+ """
return self
diff --git a/lib/sqlalchemy/sql/roles.py b/lib/sqlalchemy/sql/roles.py
index 7d64e8382..8982cb159 100644
--- a/lib/sqlalchemy/sql/roles.py
+++ b/lib/sqlalchemy/sql/roles.py
@@ -204,7 +204,7 @@ class DMLColumnRole(SQLRole):
class DMLSelectRole(SQLRole):
- """A SELECT statement embedded in DML, typically INSERT from SELECT """
+ """A SELECT statement embedded in DML, typically INSERT from SELECT"""
_role_name = "SELECT statement or equivalent textual object"
diff --git a/lib/sqlalchemy/testing/suite/test_types.py b/lib/sqlalchemy/testing/suite/test_types.py
index 3e54d87a4..468a1660e 100644
--- a/lib/sqlalchemy/testing/suite/test_types.py
+++ b/lib/sqlalchemy/testing/suite/test_types.py
@@ -49,7 +49,7 @@ class _LiteralRoundTripFixture(object):
@testing.fixture
def literal_round_trip(self, metadata, connection):
- """test literal rendering """
+ """test literal rendering"""
# for literal, we test the literal render in an INSERT
# into a typed column. we can then SELECT it back as its