summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-07-07 12:02:15 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-07-07 12:02:15 -0400
commitdb68ecff12f790fd129f03b8676b317fa17e5f28 (patch)
treebbd07a5e6a3ff042a4122db80d2ea892c6de66cf
parent71c47ac7ae7868095f6fbb61585a75292fd0ce0f (diff)
downloadsqlalchemy-db68ecff12f790fd129f03b8676b317fa17e5f28.tar.gz
remove undoc-members from query docstring [ticket:2774]
-rw-r--r--doc/build/orm/query.rst1
-rw-r--r--lib/sqlalchemy/orm/query.py7
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/build/orm/query.rst b/doc/build/orm/query.rst
index e5358792c..73aa5c555 100644
--- a/doc/build/orm/query.rst
+++ b/doc/build/orm/query.rst
@@ -21,7 +21,6 @@ Following is the full interface for the :class:`.Query` object.
.. autoclass:: sqlalchemy.orm.query.Query
:members:
- :undoc-members:
ORM-Specific Query Constructs
-----------------------------
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 7454c4853..999e97394 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -577,6 +577,13 @@ class Query(object):
@property
def selectable(self):
+ """Return the :class:`.Select` object emitted by this :class:`.Query`.
+
+ Used for :func:`.inspect` compatibility, this is equivalent to::
+
+ query.enable_eagerloads(False).with_labels().statement
+
+ """
return self.__clause_element__()
def __clause_element__(self):