summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext/declarative/api.py
diff options
context:
space:
mode:
authorFrazer McLean <frazer@frazermclean.co.uk>2016-07-26 00:02:03 +0200
committerFrazer McLean <frazer@frazermclean.co.uk>2016-08-06 02:25:27 +0100
commit87d5982e582f2439e6d6fad8b38d9f2122811f1c (patch)
tree5142c6617431ee1af688cb3cdae83f0c2f4cbdb4 /lib/sqlalchemy/ext/declarative/api.py
parentf2fa9d000b44a54b0fd3ae6114eb5d53ef20c3b8 (diff)
downloadsqlalchemy-87d5982e582f2439e6d6fad8b38d9f2122811f1c.tar.gz
Add docstring to declarative_base
Change-Id: I5ad44362515908592f1e8b1e6254a5270d43234a Pull-request: https://github.com/zzzeek/sqlalchemy/pull/295
Diffstat (limited to 'lib/sqlalchemy/ext/declarative/api.py')
-rw-r--r--lib/sqlalchemy/ext/declarative/api.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py
index e67e79d55..1abd0467e 100644
--- a/lib/sqlalchemy/ext/declarative/api.py
+++ b/lib/sqlalchemy/ext/declarative/api.py
@@ -301,6 +301,9 @@ def declarative_base(bind=None, metadata=None, mapper=None, cls=object,
compatible callable to use as the meta type of the generated
declarative base class.
+ .. versionchanged:: 1.1 if :paramref:`.declarative_base.cls` is a single class (rather
+ than a tuple), the constructed base class will inherit its docstring.
+
.. seealso::
:func:`.as_declarative`
@@ -317,6 +320,9 @@ def declarative_base(bind=None, metadata=None, mapper=None, cls=object,
class_dict = dict(_decl_class_registry=class_registry,
metadata=lcl_metadata)
+ if isinstance(cls, type):
+ class_dict['__doc__'] = cls.__doc__
+
if constructor:
class_dict['__init__'] = constructor
if mapper: