From 98459628a6c4420492ebe643e633a74ef16d0f04 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 18 Feb 2016 23:45:21 -0500 Subject: - transfer func.__doc__ to expr.__doc__ for hybrid_method if doc not present --- lib/sqlalchemy/ext/hybrid.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy/ext/hybrid.py') diff --git a/lib/sqlalchemy/ext/hybrid.py b/lib/sqlalchemy/ext/hybrid.py index 883cbaec7..61181297a 100644 --- a/lib/sqlalchemy/ext/hybrid.py +++ b/lib/sqlalchemy/ext/hybrid.py @@ -687,7 +687,7 @@ class hybrid_method(interfaces.InspectionAttrInfo): """ self.func = func - self.expr = expr or func + self.expression(expr or func) def __get__(self, instance, owner): if instance is None: @@ -700,6 +700,8 @@ class hybrid_method(interfaces.InspectionAttrInfo): SQL-expression producing method.""" self.expr = expr + if not self.expr.__doc__: + self.expr.__doc__ = self.func.__doc__ return self -- cgit v1.2.1