From f3e12698fbf03bc7c11a90f6d78d2b2a5efa70fd Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 4 Oct 2012 10:32:14 -0400 Subject: [PATCH] - fix declarative __init__ --- lib/sqlalchemy/ext/declarative/api.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py index 1a73e4f6d5..0db3f4e6b3 100644 --- a/lib/sqlalchemy/ext/declarative/api.py +++ b/lib/sqlalchemy/ext/declarative/api.py @@ -44,11 +44,9 @@ def has_inherited_table(cls): class DeclarativeMeta(type): def __init__(cls, classname, bases, dict_): - if '_decl_class_registry' in cls.__dict__: - return type.__init__(cls, classname, bases, dict_) - else: + if '_decl_class_registry' not in cls.__dict__: _as_declarative(cls, classname, cls.__dict__) - return type.__init__(cls, classname, bases, dict_) + type.__init__(cls, classname, bases, dict_) def __setattr__(cls, key, value): _add_attribute(cls, key, value) -- 2.47.3