From: Mike Bayer Date: Fri, 18 Oct 2019 02:11:31 +0000 (-0400) Subject: Fix test failures from func doc fix X-Git-Tag: rel_1_4_0b1~668 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d25c03310fd3523392d37b88c23c48cf26836248;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Fix test failures from func doc fix The doc edits in e45878bf4f9cdfb714dce8b2a4d705178947674d triggered a doctest and a pep8 failure. Change-Id: I41c6cba9bab2d3721d9c6280be47eec32f4b4736 --- diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst index 426d34e496..2537f92b5d 100644 --- a/doc/build/core/tutorial.rst +++ b/doc/build/core/tutorial.rst @@ -1382,7 +1382,7 @@ However, in order for the column expression generated by the function to have type-specific operator behavior as well as result-set behaviors, such as date and numeric coercions, the type may need to be specified explicitly:: - >>> stmt = select([func.date(some_table.c.date_string, type_=Date)]) + stmt = select([func.date(some_table.c.date_string, type_=Date)]) Functions are most typically used in the columns clause of a select statement, diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py index 4a26f89213..cbc8e539fa 100644 --- a/lib/sqlalchemy/sql/functions.py +++ b/lib/sqlalchemy/sql/functions.py @@ -580,7 +580,7 @@ class Function(FunctionElement): :param \*clauses: list of column expressions that form the arguments of the SQL function call. - :param type_: optional :class:`.TypeEngine` datatype object that will be + :param type\_: optional :class:`.TypeEngine` datatype object that will be used as the return value of the column expression generated by this function call.