summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-04-05 21:05:29 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-04-05 21:05:29 -0400
commit4527b6ab943b0f16dd3dd829d7e9872554437b2d (patch)
tree1d80b70650a4af82eeecae021dd7873e5bbf5a42
parenta68fdf0d2fc7a7e5118b996d7fbbcc9b0eda2d15 (diff)
downloadsqlalchemy-4527b6ab943b0f16dd3dd829d7e9872554437b2d.tar.gz
- Restored the import for :class:`.Function` to the ``sqlalchemy.sql.expression``
import namespace, which was removed at the beginning of 0.9.
-rw-r--r--doc/build/changelog/changelog_09.rst6
-rw-r--r--lib/sqlalchemy/sql/expression.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index fab322416..7c7f1757e 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -15,6 +15,12 @@
: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 c99665b42..9458aed04 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, \