diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-10-04 10:32:14 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-10-04 10:32:14 -0400 |
| commit | f3e12698fbf03bc7c11a90f6d78d2b2a5efa70fd (patch) | |
| tree | 24269879c802d43aa24760d4c87f3510e007d015 /lib/sqlalchemy/ext/declarative/api.py | |
| parent | f4ba5b856e470a0d9d89432859413b32cbc766d5 (diff) | |
| download | sqlalchemy-f3e12698fbf03bc7c11a90f6d78d2b2a5efa70fd.tar.gz | |
- fix declarative __init__
Diffstat (limited to 'lib/sqlalchemy/ext/declarative/api.py')
| -rw-r--r-- | lib/sqlalchemy/ext/declarative/api.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py index 1a73e4f6d..0db3f4e6b 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) |