summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Baumgold <david@davidbaumgold.com>2016-02-18 00:11:56 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2016-02-18 16:42:35 -0500
commit713e884bbf32a5f85d790de7a99cfcbfdde877d7 (patch)
treefb8503998e510ddcf56cbeea955da67fb8577c2f /lib
parentc97aa63789036fc145503f03123275253ae02d2c (diff)
downloadsqlalchemy-713e884bbf32a5f85d790de7a99cfcbfdde877d7.tar.gz
Proxy docstring along to hybrid_property and hybrid_method
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/ext/hybrid.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/hybrid.py b/lib/sqlalchemy/ext/hybrid.py
index bbf386742..22296c3de 100644
--- a/lib/sqlalchemy/ext/hybrid.py
+++ b/lib/sqlalchemy/ext/hybrid.py
@@ -784,7 +784,10 @@ class hybrid_property(interfaces.InspectionAttrInfo):
create_proxied_attribute(self)
def expr(owner):
- return proxy_attr(owner, self.__name__, self, comparator(owner))
+ return proxy_attr(
+ owner, self.__name__, self, comparator(owner),
+ doc=self.__doc__,
+ )
self.expr = expr
return self