From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 18 Oct 2019 02:11:31 +0000 (-0400)
Subject: Fix test failures from func doc fix
X-Git-Tag: rel_1_3_11~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed2b8531b5848503e904c0adb4c3df4d4f78dd03;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
(cherry picked from commit d25c03310fd3523392d37b88c23c48cf26836248)
---

diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst
index 9fd46aaca7..49e5703112 100644
--- a/doc/build/core/tutorial.rst
+++ b/doc/build/core/tutorial.rst
@@ -1368,7 +1368,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 ce3d575f57..0eee4baca2 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -617,7 +617,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.