From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 6 Apr 2014 01:05:29 +0000 (-0400)
Subject: - Restored the import for :class:`.Function` to the ``sqlalchemy.sql.expression``
X-Git-Tag: rel_0_9_5~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4527b6ab943b0f16dd3dd829d7e9872554437b2d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Restored the import for :class:`.Function` to the ``sqlalchemy.sql.expression``
import namespace, which was removed at the beginning of 0.9.
---

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index fab3224168..7c7f1757e6 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -14,6 +14,12 @@
 .. changelog::
     :version: 0.9.5
 
+    .. change::
+        :tags: bug, sql
+
+        Restored the import for :class:`.Function` to the ``sqlalchemy.sql.expression``
+        import namespace, which was removed at the beginning of 0.9.
+
     .. change::
         :tags: bug, orm, sql
         :tickets: 3013
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index c99665b426..9458aed046 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -27,7 +27,7 @@ __all__ = [
 
 
 from .visitors import Visitable
-from .functions import func, modifier, FunctionElement
+from .functions import func, modifier, FunctionElement, Function
 from ..util.langhelpers import public_factory
 from .elements import ClauseElement, ColumnElement,\
   BindParameter, UnaryExpression, BooleanClauseList, \