From: aplatkouski <5857672+aplatkouski@users.noreply.github.com> Date: Sun, 21 Jun 2020 14:24:19 +0000 (+0300) Subject: Fix failed build (pep8) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08d3f0cfe81871b18ecb638c2f1aa35b3dbd2687;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Fix failed build (pep8) Signed-off-by: aplatkouski <5857672+aplatkouski@users.noreply.github.com> --- diff --git a/lib/sqlalchemy/orm/base.py b/lib/sqlalchemy/orm/base.py index 1e6f1ee2a1..6fdf1f3726 100644 --- a/lib/sqlalchemy/orm/base.py +++ b/lib/sqlalchemy/orm/base.py @@ -463,7 +463,7 @@ class InspectionAttr(object): __slots__ = () is_selectable = False - """Return True if this object is an instance of + """Return True if this object is an instance of :class:`_expression.Selectable`.""" is_aliased_class = False @@ -505,7 +505,7 @@ class InspectionAttr(object): """ is_clause_element = False - """True if this object is an instance of + """True if this object is an instance of :class:`_expression.ClauseElement`.""" extension_type = NOT_EXTENSION diff --git a/lib/sqlalchemy/orm/context.py b/lib/sqlalchemy/orm/context.py index fe3afae349..f7a45f94cb 100644 --- a/lib/sqlalchemy/orm/context.py +++ b/lib/sqlalchemy/orm/context.py @@ -1412,16 +1412,16 @@ class ORMSelectCompileState(ORMCompileState, SelectState): "from, there are multiple FROMS which can " "join to this entity. Please use the .select_from() " "method to establish an explicit left side, as well as " - "providing an explicit ON clause if not present already to " - "help resolve the ambiguity." + "providing an explicit ON clause if not present already " + "to help resolve the ambiguity." ) else: raise sa_exc.InvalidRequestError( "Don't know how to join to %r. " "Please use the .select_from() " "method to establish an explicit left side, as well as " - "providing an explicit ON clause if not present already to " - "help resolve the ambiguity." % (right,) + "providing an explicit ON clause if not present already " + "to help resolve the ambiguity." % (right,) ) elif self._entities: @@ -1458,16 +1458,16 @@ class ORMSelectCompileState(ORMCompileState, SelectState): "from, there are multiple FROMS which can " "join to this entity. Please use the .select_from() " "method to establish an explicit left side, as well as " - "providing an explicit ON clause if not present already to " - "help resolve the ambiguity." + "providing an explicit ON clause if not present already " + "to help resolve the ambiguity." ) else: raise sa_exc.InvalidRequestError( "Don't know how to join to %r. " "Please use the .select_from() " "method to establish an explicit left side, as well as " - "providing an explicit ON clause if not present already to " - "help resolve the ambiguity." % (right,) + "providing an explicit ON clause if not present already " + "to help resolve the ambiguity." % (right,) ) else: raise sa_exc.InvalidRequestError( diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index d86b76111c..509e794302 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -759,7 +759,7 @@ class Mapper( """The :class:`_expression.Selectable` to which this :class:`_orm.Mapper` is mapped. - Typically an instance of :class:`_schema.Table`, + Typically an instance of :class:`_schema.Table`, :class:`_expression.Join`, or :class:`_expression.Alias`. The :attr:`_orm.Mapper.persist_selectable` is separate from diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py index ff0b22544a..5d7f80b1ba 100644 --- a/lib/sqlalchemy/sql/sqltypes.py +++ b/lib/sqlalchemy/sql/sqltypes.py @@ -2235,7 +2235,7 @@ class JSON(Indexable, TypeEngine): ) While it is possible to use :attr:`_types.JSON.NULL` in this context, the - :attr:`_types.JSON.NULL` value will be returned as the value of the + :attr:`_types.JSON.NULL` value will be returned as the value of the column, which in the context of the ORM or other repurposing of the default value, may not be desirable. Using a SQL expression means the value diff --git a/lib/sqlalchemy/sql/visitors.py b/lib/sqlalchemy/sql/visitors.py index 9ffde2c0ae..56d3c93b3c 100644 --- a/lib/sqlalchemy/sql/visitors.py +++ b/lib/sqlalchemy/sql/visitors.py @@ -380,7 +380,7 @@ class InternalTraversal(util.with_metaclass(_InternalTraversalType, object)): """ dp_table_hint_list = symbol("TH") - """Visit the ``_hints`` collection of a :class:`_expression.Select` + """Visit the ``_hints`` collection of a :class:`_expression.Select` object. """