summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2019-10-17 22:11:31 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2019-10-17 22:12:31 -0400
commita67a3554208bc59322dedff628f3b303ae1dbf1e (patch)
treed55c6ce4b312021f473bcf4002335c324c41be39
parentc72d4e27772d23e2b8e5d3dc9ff844fae9a2f1ec (diff)
downloadsqlalchemy-a67a3554208bc59322dedff628f3b303ae1dbf1e.tar.gz
Fix test failures from func doc fix
The doc edits in e45878bf4f9cdfb714dce8b2a4d705178947674d triggered a doctest and a pep8 failure. Change-Id: I41c6cba9bab2d3721d9c6280be47eec32f4b4736 (cherry picked from commit d25c03310fd3523392d37b88c23c48cf26836248)
-rw-r--r--doc/build/core/tutorial.rst2
-rw-r--r--lib/sqlalchemy/sql/functions.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst
index f7b28a3db..211ef3b93 100644
--- a/doc/build/core/tutorial.rst
+++ b/doc/build/core/tutorial.rst
@@ -1357,7 +1357,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 f24c51ff2..67d404fef 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -426,7 +426,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.