From: Mike Bayer Date: Fri, 22 Nov 2019 16:08:37 +0000 (-0500) Subject: Fix rst for flake8-rst-docstrings-0.0.12 X-Git-Tag: rel_1_4_0b1~616 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bf1a9c0d8e122da79898835c007ea904e238c21;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Fix rst for flake8-rst-docstrings-0.0.12 A few new formatting errors are caught by this version. Change-Id: I737b33267a00f400b7ba7696a03ddb07a4c95bc0 --- diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index 004a84da55..11d069c88c 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -6,7 +6,7 @@ # the MIT License: http://www.opensource.org/licenses/mit-license.php """Define result set constructs including :class:`.ResultProxy` -and :class:`.Row.""" +and :class:`.Row`.""" import collections diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py index d11a3a3139..ce7fab5b0b 100644 --- a/lib/sqlalchemy/sql/base.py +++ b/lib/sqlalchemy/sql/base.py @@ -822,14 +822,14 @@ class ColumnCollection(object): class DedupeColumnCollection(ColumnCollection): - """A :class:`.ColumnCollection that maintains deduplicating behavior. + """A :class:`.ColumnCollection` that maintains deduplicating behavior. This is useful by schema level objects such as :class:`.Table` and :class:`.PrimaryKeyConstraint`. The collection includes more sophisticated mutator methods as well to suit schema objects which require mutable column collections. - .. versionadded: 1.4 + .. versionadded:: 1.4 """ diff --git a/test/orm/test_deferred.py b/test/orm/test_deferred.py index 4f76fdc039..0b95c324d7 100644 --- a/test/orm/test_deferred.py +++ b/test/orm/test_deferred.py @@ -989,7 +989,7 @@ class DeferredOptionsTest(AssertsCompiledSQL, _fixtures.FixtureTest): eq_(item.description, "item 4") def test_path_entity(self): - """test the legacy *addl_attrs argument.""" + r"""test the legacy \*addl_attrs argument.""" User = self.classes.User Order = self.classes.Order